Merge branch '20.0.x' into rivanova/fix-15848-master

RivaIvanova · web-flow · commit 1bc061b764b7 · 2025-06-19T09:33:35.000+03:00
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/column-actions/_column-actions-theme.scss
@@ -95,7 +95,7 @@
 
     %column-actions-input {
         font-size: rem(16px) !important;
-        margin: rem(-16px) 0 0 !important;
+        margin: 0 !important;
         padding: rem(8px) rem(16px);
     }
 
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
@@ -301,6 +301,13 @@
                 padding: 0;
             }
         }
+
+        &:not(.igx-input-group--disabled){
+          %igx-combo__clear-button {
+                color: var-get($theme, 'clear-button-foreground');
+                background: var-get($theme, 'clear-button-background');
+            }
+        }
     }
 
     %form-group-bundle:not(%form-group-bundle--disabled):focus-within {

Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,13 @@`
`301`	`301`	`padding: 0;`
`302`	`302`	`}`
`303`	`303`	`}`
	`304`	`+`
	`305`	`+ &:not(.igx-input-group--disabled){`
	`306`	`+ %igx-combo__clear-button {`
	`307`	`+ color: var-get($theme, 'clear-button-foreground');`
	`308`	`+ background: var-get($theme, 'clear-button-background');`
	`309`	`+ }`
	`310`	`+ }`
`304`	`311`	`}`
`305`	`312`
`306`	`313`	`%form-group-bundle:not(%form-group-bundle--disabled):focus-within {`