Merge branch '20.1.x' into apetrov/fix-tabs-demo-icon-20.1.x

simeonoff · web-flow · commit b0a7c825b683 · 2025-11-10T11:58:36.000+02:00
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/combo/_combo-theme.scss
@@ -210,12 +210,24 @@
             color: var-get($theme, 'clear-button-foreground-focus');
             background: var-get($theme, 'clear-button-background-focus');
         }
+
+        &%form-group-bundle--border {
+            %igx-combo__toggle-button {
+                background: var-get($theme, 'toggle-button-background-focus--border');
+            }
+        }
     }
 
     @if $variant == 'indigo' {
         %form-group-bundle:not(%form-group-bundle--disabled):hover {
             %igx-combo__toggle-button {
                 color: var-get($theme, 'toggle-button-foreground-focus');
+                background: var-get($theme, 'toggle-button-background-focus');
+            }
+
+            %igx-combo__clear-button {
+                color: var-get($theme, 'clear-button-foreground-focus');
+                background: var-get($theme, 'clear-button-background-focus');
             }
         }
     }
@@ -224,6 +236,14 @@
         %igx-combo__toggle-button {
             color: var-get($theme, 'toggle-button-foreground-filled');
         }
+
+        @if $variant == 'material' {
+            &.igx-input-group--focused {
+                %igx-combo__toggle-button {
+                    color: var-get($theme, 'toggle-button-foreground-filled');
+                }
+            }
+        }
     }
 
     .igx-input-group--focused {
@@ -254,14 +274,6 @@
         }
     }
 
-    //.igx-input-group:not(.igx-input-group--box) {
-    //    %igx-combo__toggle-button:focus {
-    //        @if $variant == 'material' {
-    //            background: var-get($theme, 'toggle-button-background-focus--border');
-    //        }
-    //    }
-    //}
-
     .igx-input-group--disabled {
         %igx-combo__toggle-button {
             background: var-get($theme, 'toggle-button-background-disabled') !important;
@@ -274,12 +286,4 @@
             }
         }
     }
-
-    %form-group-bundle {
-        &:hover {
-            %igx-combo__clear-button {
-                color: inherit;
-            }
-        }
-    }
 }
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/select/_select-theme.scss
@@ -55,7 +55,7 @@
 
     .igx-input-group.igx-input-group--disabled.igx-input-group--filled,
     .igx-input-group.igx-input-group--disabled {
-        %igx-select__toggle-button {
+        %form-group-bundle %igx-select__toggle-button {
             background: var-get($theme, 'toggle-button-background-disabled');
             color: var-get($theme, 'toggle-button-foreground-disabled');
         }

Original file line number	Diff line number	Diff line change
`@@ -210,12 +210,24 @@`
`210`	`210`	`color: var-get($theme, 'clear-button-foreground-focus');`
`211`	`211`	`background: var-get($theme, 'clear-button-background-focus');`
`212`	`212`	`}`
	`213`	`+`
	`214`	`+ &%form-group-bundle--border {`
	`215`	`+ %igx-combo__toggle-button {`
	`216`	`+ background: var-get($theme, 'toggle-button-background-focus--border');`
	`217`	`+ }`
	`218`	`+ }`
`213`	`219`	`}`
`214`	`220`
`215`	`221`	`@if $variant == 'indigo' {`
`216`	`222`	`%form-group-bundle:not(%form-group-bundle--disabled):hover {`
`217`	`223`	`%igx-combo__toggle-button {`
`218`	`224`	`color: var-get($theme, 'toggle-button-foreground-focus');`
	`225`	`+ background: var-get($theme, 'toggle-button-background-focus');`
	`226`	`+ }`
	`227`	`+`
	`228`	`+ %igx-combo__clear-button {`
	`229`	`+ color: var-get($theme, 'clear-button-foreground-focus');`
	`230`	`+ background: var-get($theme, 'clear-button-background-focus');`
`219`	`231`	`}`
`220`	`232`	`}`
`221`	`233`	`}`
`@@ -224,6 +236,14 @@`
`224`	`236`	`%igx-combo__toggle-button {`
`225`	`237`	`color: var-get($theme, 'toggle-button-foreground-filled');`
`226`	`238`	`}`
	`239`	`+`
	`240`	`+ @if $variant == 'material' {`
	`241`	`+ &.igx-input-group--focused {`
	`242`	`+ %igx-combo__toggle-button {`
	`243`	`+ color: var-get($theme, 'toggle-button-foreground-filled');`
	`244`	`+ }`
	`245`	`+ }`
	`246`	`+ }`
`227`	`247`	`}`
`228`	`248`
`229`	`249`	`.igx-input-group--focused {`
`@@ -254,14 +274,6 @@`
`254`	`274`	`}`
`255`	`275`	`}`
`256`	`276`
`257`		`- //.igx-input-group:not(.igx-input-group--box) {`
`258`		`- // %igx-combo__toggle-button:focus {`
`259`		`- // @if $variant == 'material' {`
`260`		`- // background: var-get($theme, 'toggle-button-background-focus--border');`
`261`		`- // }`
`262`		`- // }`
`263`		`- //}`
`264`		`-`
`265`	`277`	`.igx-input-group--disabled {`
`266`	`278`	`%igx-combo__toggle-button {`
`267`	`279`	`background: var-get($theme, 'toggle-button-background-disabled') !important;`
`@@ -274,12 +286,4 @@`
`274`	`286`	`}`
`275`	`287`	`}`
`276`	`288`	`}`
`277`		`-`
`278`		`- %form-group-bundle {`
`279`		`- &:hover {`
`280`		`- %igx-combo__clear-button {`
`281`		`- color: inherit;`
`282`		`- }`
`283`		`- }`
`284`		`- }`
`285`	`289`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@`
`55`	`55`
`56`	`56`	`.igx-input-group.igx-input-group--disabled.igx-input-group--filled,`
`57`	`57`	`.igx-input-group.igx-input-group--disabled {`
`58`		`- %igx-select__toggle-button {`
	`58`	`+ %form-group-bundle %igx-select__toggle-button {`
`59`	`59`	`background: var-get($theme, 'toggle-button-background-disabled');`
`60`	`60`	`color: var-get($theme, 'toggle-button-foreground-disabled');`
`61`	`61`	`}`