Rebased to the latest

Alfresco · Apr 30, 2024 · 34be5d3 · 34be5d3
1 parent 6d3bd7f
commit 34be5d3
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 46 deletions.
diff --git a/...ch/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss b/...ch/components/search-date-range-tabbed/search-date-range/search-date-range.component.scss
@@ -40,7 +40,7 @@ adf-search-date-range {
 
                 #{$mat-form-field-flex} {
                     #{$mat-form-field-infix} {
-                        padding: 0.375em 0 4px 0;
+                        padding: 0.375em 0 4px;
                     }
                 }
             }

diff --git a/...ents/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss b/...ents/search-filter-chips/search-facet-chip-tabbed/search-facet-chip-tabbed.component.scss
@@ -16,6 +16,6 @@ adf-search-facet-chip-tabbed {
     }
 }
 
-.adf-search-widget-extra-width.mat-mdc-menu-panel {
+.adf-search-widget-extra-width#{$mat-menu-panel} {
     max-width: 500px;
 }
diff --git a/...ent-services/src/lib/search/components/search-properties/search-properties.component.scss b/...ent-services/src/lib/search/components/search-properties/search-properties.component.scss
@@ -20,6 +20,7 @@ adf-search-properties {
             #{$mat-form-field-infix} {
                 height: 37.5px;
                 min-height: 37.5px;
+                display: inline-block;
             }
 
             #{$mat-select-trigger} {
@@ -36,10 +37,6 @@ adf-search-properties {
                 }
             }
 
-            #{$mat-form-field-infix} {
-                display: inline-block;
-            }
-
             #{$mat-select-arrow} {
                 margin-left: 5px;
             }
@@ -50,17 +47,53 @@ adf-search-properties {
         }
 
         adf-search-chip-autocomplete-input {
+            display: block;
+
+            #{$mat-text-field-outlined} {
+                &-start,
+                &-end {
+                    border-top: 1px solid var(--adf-theme-mat-grey-color-a400);
+                    border-bottom: 1px solid var(--adf-theme-mat-grey-color-a400);
+                }
+
+                &-start {
+                    border-left: 1px solid var(--adf-theme-mat-grey-color-a400);
+                }
+
+                &-end {
+                    border-right: 1px solid var(--adf-theme-mat-grey-color-a400);
+                }
+            }
+
+            #{$mat-focused} {
+                #{$mat-text-field-outlined} {
+                    outline: 2px auto -webkit-focus-ring-color;
+                }
+            }
+
+            #{$mat-form-field-appearance-outline} {
+                #{$mat-text-field-outlined-thick} {
+                    #{$mat-text-field-outlined} {
+                        &-start,
+                        &-end {
+                            border-width: 1px;
+                        }
+                    }
+                }
+            }
+
             #{$mat-notched-outline-leading} {
-                border-color: var(--adf-theme-foreground-text-color-027) !important;
+                border-color: var(--adf-theme-foreground-text-color-027);
             }
 
             #{$mat-notched-outline-trailing} {
-                border-color: var(--adf-theme-foreground-text-color-027) !important;
+                border-color: var(--adf-theme-foreground-text-color-027);
             }
         }
     }
 
-    input, .mat-form-field-infix.mat-form-field-infix {
+    input,
+    .mat-form-field-infix.mat-form-field-infix {
         height: 25px;
         border: 1px solid var(--adf-theme-mat-grey-color-a400);
         border-radius: 5px;
@@ -91,43 +124,6 @@ adf-search-properties {
         width: 78px;
     }
 
-    adf-search-chip-autocomplete-input {
-        display: block;
-
-        #{$mat-text-field-outlined} {
-            &-start,
-            &-end {
-                border-top: 1px solid var(--adf-theme-mat-grey-color-a400);
-                border-bottom: 1px solid var(--adf-theme-mat-grey-color-a400);
-            }
-
-            &-start {
-                border-left: 1px solid var(--adf-theme-mat-grey-color-a400);
-            }
-
-            &-end {
-                border-right: 1px solid var(--adf-theme-mat-grey-color-a400);
-            }
-        }
-
-        #{$mat-focused} {
-            #{$mat-text-field-outlined} {
-                outline: 2px auto -webkit-focus-ring-color;
-            }
-        }
-
-        #{$mat-form-field-appearance-outline} {
-            #{$mat-text-field-outlined-thick} {
-                #{$mat-text-field-outlined} {
-                    &-start,
-                    &-end {
-                        border-width: 1px;
-                    }
-                }
-            }
-        }
-    }
-
     .adf-search-properties-file-type-label {
         margin-top: 10px;
         margin-bottom: 6px;