Skip to content

Commit 9da7a87

Browse files
authored
Merge branch 'master' into bpachilova/fix-14135
2 parents b5a9a47 + c774857 commit 9da7a87

File tree

2 files changed

+29
-3
lines changed

2 files changed

+29
-3
lines changed

projects/igniteui-angular/src/lib/core/styles/components/button/_button-theme.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@
139139
}
140140
}
141141

142+
@if not($icon-color) and $background {
143+
@if meta.type-of($background) == 'color' {
144+
$icon-color: text-contrast($background);
145+
}
146+
}
147+
142148
@if not($icon-color-hover) and $hover-foreground {
143149
@if meta.type-of($hover-background) == 'color' {
144150
$icon-color-hover: $hover-foreground;
@@ -577,7 +583,7 @@
577583
background: var-get($flat-theme, 'focus-visible-background');
578584
color: var-get($flat-theme, 'focus-visible-foreground');
579585
border-color: var-get($flat-theme, 'focus-visible-border-color');
580-
586+
581587
igx-icon {
582588
color: var-get($flat-theme, 'icon-color');
583589
}
@@ -599,7 +605,7 @@
599605
color: var-get($flat-theme, 'focus-foreground');
600606
}
601607
}
602-
608+
603609
@if ($variant == 'bootstrap') {
604610
box-shadow: 0 0 0 rem(4px) var-get($flat-theme, 'shadow-color');
605611
}
@@ -780,7 +786,7 @@
780786
map.get($items-gap, 'cosy'),
781787
$items-gap-indigo-comfortable
782788
);
783-
789+
784790
&:active {
785791
igx-icon {
786792
color: var-get($outlined-theme, 'icon-color-hover');

projects/igniteui-angular/src/lib/core/styles/components/grid/_excel-filtering-theme.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,35 @@
113113
--item-hover-background: #{color($color: 'gray', $variant: 100)};
114114
--item-selected-background: #{color($color: 'gray', $variant: 100)};
115115
--item-text-color: #{color($color: 'gray', $variant: 700)};
116+
--item-icon-color: #{color($color: 'gray', $variant: 700)};
116117
--item-hover-text-color: #{color($color: 'gray', $variant: 800)};
118+
--item-hover-icon-color: #{color($color: 'gray', $variant: 800)};
117119
--item-selected-text-color: #{if(
118120
$variant == 'indigo-design',
119121
contrast-color($color: 'surface'),
120122
color($color: 'secondary', $variant: 500)
121123
)};
124+
--item-selected-icon-color: #{if(
125+
$variant == 'indigo-design',
126+
contrast-color($color: 'surface'),
127+
color($color: 'secondary', $variant: 500)
128+
)};
129+
--item-selected-hover-icon-color: #{if(
130+
$variant == 'fluent',
131+
color($color: 'secondary', $variant: 500),
132+
contrast-color($color: 'gray', $variant: 50)
133+
)};
122134
--item-border-color: transparent;
135+
--item-hover-border-color: transparent;
136+
--item-focused-border-color: #{if(
137+
$variant == 'fluent',
138+
color($color: 'gray', $variant: 700),
139+
transparent
140+
)};
123141
--item-selected-border-color: transparent;
142+
--item-selected-hover-border-color: transparent;
124143
--item-disabled-border: transparent;
144+
--disabled-selected-border-color: transparent;
125145
}
126146

127147
@include tree(tree-theme(

0 commit comments

Comments
 (0)