@sumaris-net/ngx-components 2.7.3-rc6 → 2.7.3-rc60

package/src/theme/_ngx-components.forms.scss

@@ -0,0 +1,201 @@
+
+// --------------------------------------------------
+// Material Forms
+// --------------------------------------------------
+.form-container,
+form.form-container {
+  color: #{$app-form-color};
+  @include font-size(16px);
+
+  --mdc-filled-text-field-container-color: var(--app-form-field-background-color);
+  --mdc-filled-text-field-disabled-container-color: var(--app-form-field-disabled-background-color);
+  --mat-form-field-state-layer-color: var(--app-form-field-focus-background-color);
+  --mat-form-field-container-height: 45px;
+  --mat-form-field-container-text-size: inherit;
+  --mat-form-field-filled-label-display: block;
+  --mat-form-field-container-vertical-padding: 8px;
+  --mat-form-field-filled-with-label-container-padding-top: 18px;
+  --mat-form-field-filled-with-label-container-padding-bottom: 0px;
+  --mdc-filled-text-field-label-text-tracking: normal;
+  --mat-select-trigger-text-size: var(--mat-form-field-container-text-size);
+
+  .mat-form-field-disabled,
+  .mat-mdc-input-element:disabled {
+    color: #{$app-form-color-disabled} !important;
+  }
+
+  .mat-form-field-disabled {
+    .mat-mdc-form-field-infix {
+      min-height: var(--mat-form-field-container-height);
+    }
+  }
+
+  mat-form-field,
+  mat-autocomplete-field,
+  app-form-field {
+    width: 100%;
+  }
+
+  .mat-mdc-form-field {
+    &:not(.mat-mdc-form-field-has-icon-prefix) {
+      .mdc-text-field {
+        padding-left: 4px;
+      }
+    }
+
+    ion-icon[matPrefix],
+    mat-icon[matPrefix],
+    .mat-mdc-form-field-icon-prefix {
+
+      --mdc-icon-button-icon-size: 24px;
+      --mdc-icon-button-icon-color: inherit;
+      --mdc-icon-button-state-layer-size: 48px;
+      --mdc-icon-button-margin-vertical: 12px;
+
+      ion-icon, .mat-icon {
+        font-size: var(--mdc-icon-button-icon-size) !important;
+        line-height: 1.125;
+        height: var(--mdc-icon-button-icon-size);
+        width: var(--mdc-icon-button-icon-size);
+        margin-left: var(--mdc-icon-button-margin-vertical);
+        margin-right: var(--mdc-icon-button-margin-vertical);
+        position: relative;
+        color: var(--mdc-icon-button-icon-color);
+        fill: var(--mdc-icon-button-icon-color);
+      }
+    }
+
+    ion-icon[matSuffix],
+    mat-icon[matSuffix],
+    .mat-mdc-form-field-icon-suffix {
+      white-space: nowrap;
+
+      .mat-mdc-icon-button {
+        --mdc-icon-button-state-layer-size: 24px;
+        --mdc-icon-button-icon-size: 16px;
+        --mdc-icon-button-padding: 4px;
+        padding: var(--mdc-icon-button-padding);
+
+        &.large {
+          --mdc-icon-button-state-layer-size: 48px;
+          --mdc-icon-button-icon-size: 24px;
+          --mdc-icon-button-padding: 12px;
+        }
+
+        ion-icon, .mat-icon {
+          height: var(--mdc-icon-button-icon-size);
+          width: var(--mdc-icon-button-icon-size);
+          font-size: var(--mdc-icon-button-icon-size);
+        }
+
+        .mat-mdc-button-touch-target {
+          width: var(--mdc-icon-button-state-layer-size);
+        }
+      }
+
+      ion-icon, .mat-icon {
+
+        &.large {
+          $font-size: calculateRem(14px);
+          font-size: $font-size;
+          line-height: 1.125;
+        }
+      }
+
+    }
+
+    // When field use choice button, reduce the font size, and optimize layout
+    button.mat-mdc-form-field-button,
+    ion-button.mat-mdc-form-field-button {
+      @include font-size-important(12px);
+      margin: 0;
+      white-space: normal;
+    }
+
+    // Used to customize mat-boolean-field
+    &.mat-boolean-field-checkbox {
+      --mdc-checkbox-state-layer-size: 20px;
+
+      .mat-mdc-form-field-infix {
+        padding-top: 16px;
+      }
+
+      .mdc-floating-label {
+        transform: unset !important;
+        padding-left: 30px;
+        top: 20px;
+      }
+    }
+
+    &.mat-boolean-field-radio {
+      --mdc-radio-state-layer-size: 20px;
+
+      .mat-mdc-radio-button {
+        padding-left: 8px;
+      }
+    }
+
+    &.mat-boolean-field-button {
+      .mat-mdc-form-field-infix {
+        padding-top: calc(var(--mat-form-field-filled-with-label-container-padding-top, 0px) + 4px);
+      }
+    }
+  }
+
+  .mat-mdc-form-field-subscript-wrapper {
+    mat-hint {
+      --color: rgb(115,115,115);
+      color: var(--color);
+    }
+  }
+
+  /* -- Computed field -- */
+
+  // Set color on computed field (if enable or disable)
+  .computed .mat-mdc-form-field,
+  .mat-mdc-form-field .computed,
+  .mat-mdc-form-field.computed,
+  .computed .mat-mdc-form-field .mat-mdc-input-element:disabled,
+  .mat-mdc-form-field .computed .mat-mdc-input-element:disabled,
+  .mat-mdc-form-field.computed .mat-mdc-input-element:disabled {
+    color: var(--ion-color-primary-tint) !important;
+    font-style: italic;
+  }
+
+  /* MatSwipeField */
+  mat-swipe-field {
+
+    .mdc-floating-label--float-above {
+      transform: translateY(-106%) translateX(40px) scale(0.75) !important;
+    }
+  }
+
+
+}
+// Manage first child grid inside a form
+form.form-container > ion-grid,
+ion-grid.form-container {
+  padding: 0;
+
+  & > ion-row {
+    // No between grid rows
+    padding: 0;
+
+    & > ion-col {
+
+      // No top/bottom padding between grid cell
+      padding-bottom: 0;
+      padding-top: 0;
+
+      & > ion-label {
+        color: var(--ion-color-primary100);
+        padding-inline-end: 5px;
+      }
+
+      & > ion-label[text-wrap] {
+        word-wrap: normal;
+        white-space: normal;
+      }
+    }
+  }
+}

package/src/theme/_ngx-components.globals.scss

@@ -16,7 +16,10 @@ $app-form-buttons-bar-height: 56px !default;
 $app-select-option-border-color: rgba(0, 0, 0, 0.12) !default;
 $app-table-border-color: rgba(0, 0, 0, 0.08) !default;
 
-$app-form-field-background-color: rgba(0,0,0,0) !default;
-//$app-form-field-background-color: whitesmoke !default;
-$app-form-field-focus-background-color: rgba(0, 0, 0, 0) !default;
-//$app-form-field-focus-background-color: rgba(0, 0, 0, 0.87) !default;
+// Form's field background
+$app-form-field-background-color: rgb(245,245,245) !default;
+$app-form-field-disabled-background-color: #fafafa !default;
+
+// Form fields background : transparent
+//$app-form-field-background-color: transparent !default;
+//$app-form-field-disabled-background-color: transparent !default;

package/src/theme/_ngx-components.scss

@@ -126,200 +126,14 @@ ion-menu.menu-side-left {
   }
 }
 
-// --------------------------------------------------
-// Material Forms
-// --------------------------------------------------
-.form-container,
-form.form-container {
-  color: #{$app-form-color};
-  --mdc-filled-text-field-container-color: #{$app-form-field-background-color};
-  --mdc-filled-text-field-disabled-container-color: #{$app-form-field-background-color};
-  --mat-form-field-state-layer-color: #{$app-form-field-focus-background-color};
-  @include font-size(16px);
-
-  .mat-form-field-disabled,
-  .mat-mdc-input-element:disabled {
-    color: #{$app-form-color-disabled} !important;
-  }
-
-  .mat-form-field-disabled {
-    .mat-mdc-form-field-infix{
-      min-height: 41px;
-    }
-  }
-
-  mat-form-field,
-  mat-autocomplete-field,
-  app-form-field {
-    width: 100%;
-  }
-
-  .mat-mdc-form-field {
-
-    &:not(.mat-mdc-form-field-has-icon-prefix) {
-      .mdc-text-field {
-        padding-left: 4px;
-      }
-    }
-
-    ion-icon[matPrefix],
-    mat-icon[matPrefix],
-    .mat-mdc-form-field-icon-prefix {
-
-      ion-icon, .mat-icon {
-        $font-size: calculateRem(24px);
-        $margin-vertical: calculateRem(4px);
-        font-size: $font-size !important;
-        line-height: 1.125;
-        height: $font-size;
-        width: $font-size;
-        margin-left: $margin-vertical;
-        margin-right: $margin-vertical;
-        position: relative;
-      }
-    }
-
-    ion-icon[matSuffix],
-    mat-icon[matSuffix],
-    .mat-mdc-form-field-icon-suffix {
-      white-space: nowrap;
-
-      .mat-mdc-icon-button {
-        --mdc-icon-button-icon-size: 24px;
-        --mdc-icon-button-state-layer-size: 28px;
-        padding: 2px;
-
-        ion-icon, .mat-icon, .mat-icon.large {
-          font-size: var(--mdc-icon-button-icon-size);
-          line-height: var(--mdc-icon-button-icon-size);
-        }
-
-        .mat-mdc-button-touch-target {
-          width: var(--mdc-icon-button-state-layer-size);
-        }
-      }
-
-      ion-icon, .mat-icon {
-
-        &.large {
-          $font-size: calculateRem(24px);
-          font-size: $font-size;
-          line-height: 1.125;
-        }
-      }
-
-    }
-
-    // When field use choice button, reduce the font size, and optimize layout
-    button.mat-mdc-form-field-button,
-    ion-button.mat-mdc-form-field-button {
-      @include font-size-important(12px);
-      margin: 0;
-      white-space: normal;
-    }
-
-    // Used to customize mat-boolean-field
-    &.mat-boolean-field-checkbox {
-      --mdc-checkbox-state-layer-size: 20px;
-
-      .mat-mdc-form-field-infix {
-        padding-top: 16px;
-      }
-
-      .mdc-floating-label {
-        transform: unset !important;
-        padding-left: 30px;
-        top: 20px;
-      }
-    }
-
-    &.mat-boolean-field-radio {
-      --mdc-radio-state-layer-size: 20px;
-
-      .mat-mdc-radio-button {
-        padding-left: 8px;
-      }
-    }
-
-    &.mat-boolean-field-button {
-      .mat-mdc-form-field-infix {
-        padding-top: 0;
-        padding-bottom: 0;
-      }
-    }
-  }
-
-
-  /* -- Computed field -- */
-
-  // Set color on computed field (if enable or disable)
-  .computed mat-mdc-form-field,
-  mat-mdc-form-field .computed,
-  mat-mdc-form-field.computed,
-  .computed mat-mdc-form-field .mat-mdc-input-element:disabled,
-  mat-mdc-form-field .computed .mat-mdc-input-element:disabled,
-  mat-mdc-form-field.computed .mat-mdc-input-element:disabled {
-    color: var(--ion-color-primary-tint) !important;
-    font-style: italic;
-  }
-
-  /* MatSwipeField */
-  mat-swipe-field {
-
-    .mdc-floating-label--float-above {
-      transform: translateY(-106%) translateX(40px) scale(0.75) !important;
-    }
-
-  }
-}
-// Manage first child grid inside a form
-form.form-container > ion-grid,
-ion-grid.form-container {
-  padding: 0;
-
-  ion-row {
-    // No between grid rows
-    padding: 0;
-
-    ion-col > ion-label {
-      color: var(--ion-color-primary100);
-      padding-inline-end: 5px;
-    }
-
-    ion-col > ion-label[text-wrap] {
-      word-wrap: normal;
-      white-space: normal;
-    }
-  }
-  ion-row > ion-col {
-
-    // No top/bottom padding between grid cell
-    padding-bottom: 0;
-    padding-top: 0;
-  }
-}
 
 mat-form-field {
-  //mat-error {
-  //  text-align: right;
-  //}
 
   .mat-paginator-page-size-select {
     @include font-size-important(14px);
   }
 }
 
-
-// --- mat-date-time
-mat-date-time-field {
-  //@include font-size-important(16px);
-
-  // Need for errors injected using the <ng-content> tag
-  //mat-error {
-  //  text-align: end;
-  //}
-}
-
 // --- mat-date-short-field
 mat-calendar.mat-date-short-panel {
   // Hide some buttons (e.g. to change the period)
@@ -351,12 +165,6 @@ mat-option {
     flex-grow: 1;
   }
   .mat-option-text:not(:has(ion-row)),
-
-  // TODO : Disabled : mat-option already have padding : this is redundant
-  //.mdc-list-item__primary-text:not(:has(ion-row)) {
-  //  padding: 0 16px;
-  //}
-
   .mat-option-text:has(ion-searchbar),
   .mdc-list-item__primary-text:has(ion-searchbar) {
     padding: 0 !important;
@@ -464,7 +272,7 @@ ion-list,
     }
   }
 
-  .mat-mdc-option.mat-select-searchbar,
+  .mat-mdc-optgroup.mat-select-searchbar,
   .mat-mdc-option.mat-autocomplete-searchbar
   {
     padding: 0 !important;
@@ -472,8 +280,10 @@ ion-list,
     background-color: var(--ion-color-secondary100) !important;
     pointer-events: inherit !important;
 
-    .mdc-list-item__primary-text {
-      opacity: 1 !important;
+    .mat-mdc-optgroup-label {
+      background-color: var(--ion-color-secondary100) !important;
+      padding: 0;
+      display: block;
     }
 
     /* hide pseudo checkbox, in the searchbar*/
@@ -570,7 +380,6 @@ ion-list,
   }
 
   .mat-mdc-option[no-padding],
-  .mat-option[no-padding],
   mat-option[no-padding] {
     padding: 0 !important;
   }
@@ -757,8 +566,8 @@ mat-button-toggle.mat-button-toggle-checked.mat-button-toggle-disabled {
   }
 
   // Small menu item (e.g. for actions on a table row)
-  &.mat-menu-small-item-height .mat-mdc-menu-item,
-  .mat-mdc-menu-item.mat-menu-item-small-height
+  &.mat-mdc-menu-item-small-height .mat-mdc-menu-item,
+  .mat-mdc-menu-item.mat-mdc-menu-item-small-height
   {
     padding: 0 8px;
     height: 35px;
@@ -775,7 +584,7 @@ mat-button-toggle.mat-button-toggle-checked.mat-button-toggle-disabled {
   }
 
   // Menu title (e.g. see extraction map)
-  .mat-mdc-menu-item.mat-menu-title {
+  .mat-mdc-menu-item.mat-mdc-menu-title {
     padding: 0 8px;
     height: 27px;
     line-height: 27px;
@@ -853,7 +662,6 @@ ngx-material-timepicker-content {
 
 .mat-mdc-form-field-type-mat-chip-grid {
   .mat-mdc-form-field-infix {
-    padding-bottom: 5px !important;
     --mdc-chip-container-height: 24px !important;
   }
 }