Skip to content

Commit 142446a

Browse files
author
MPopov
committed
fix(theming): fix currentColor in EDGE
1 parent f197f18 commit 142446a

File tree

7 files changed

+52
-54
lines changed

7 files changed

+52
-54
lines changed

projects/igniteui-angular/src/lib/core/styles/components/icon/_icon-theme.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@
5555
@mixin igx-icon($theme) {
5656
@include igx-root-css-vars($theme);
5757

58-
// @debug $theme;
59-
6058
$igx-icon-font-size: --var($theme, 'size');
6159

6260
%igx-icon-display {

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_action-strip.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
///
88
/// Generates a light action-strip schema.
99
/// @type {Map}
10-
/// @prop {Color} $color [currentColor] - The color used for the actions icons.
10+
/// @prop {Color} $color ["'currentColor'"] - The color used for the actions icons.
1111
/// @prop {Map} background [igx-color: ('grays', 100] - The color used for the action strip component content background.
1212
/// @prop {Map} actions-background [igx-color: ('grays', 200), hexrgba: #fff, rgba: .9] - The color used for actions background.
1313
/// @prop {Map} delete-action [igx-color: ('error')] - The color used for the delete icon in action strip component.
@@ -28,7 +28,7 @@ $_light-action-strip: extend(
2828
igx-color: ('grays', 100)
2929
),
3030

31-
color: currentColor,
31+
color: "'currentColor'",
3232

3333
delete-action: (
3434
igx-color: ('error')

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_button.scss

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
/// @prop {Map} flat-hover-text-color [igx-color: ('secondary', 500)] - The hover text color of a flat button.
1717
/// @prop {Map} flat-focus-background [igx-color: ('secondary', 400), rgba: .12] - The focus background color of a flat button.
1818
/// @prop {Map} flat-focus-text-color [igx-color: ('secondary', 500)] - The focus text color of a flat button.
19-
/// @prop {Color} flat-icon-color [currentColor] - The color of a flat button icon.
20-
/// @prop {Color} flat-hover-icon-color [currentColor] - The hover color of a flat button icon.
21-
/// @prop {Color} flat-focus-icon-color [currentColor] - The focus color of a flat button icon.
19+
/// @prop {Color} flat-icon-color ["'currentColor'"] - The color of a flat button icon.
20+
/// @prop {Color} flat-hover-icon-color ["'currentColor'"] - The hover color of a flat button icon.
21+
/// @prop {Color} flat-focus-icon-color ["'currentColor'"] - The focus color of a flat button icon.
2222
///
2323
/// @prop {Color} outlined-background [transparent] - The background color of an outlined button
2424
/// @prop {Map} outlined-text-color [igx-color: ('secondary', 500)] - The idle text color of an outlined button.
@@ -28,19 +28,19 @@
2828
/// @prop {Map} outlined-hover-text-color [igx-color: ('secondary', 500)] - The hover text color of an outlined button.
2929
/// @prop {Map} outlined-focus-background [igx-color: ('secondary', 400), rgba: .12] - The focus background color of an outlined button.
3030
/// @prop {Map} outlined-focus-text-color [igx-color: ('secondary', 500)] - The focus text color of an outlined button.
31-
/// @prop {Color} outlined-icon-color [currentColor] - The color of a outlined button icon.
32-
/// @prop {Color} outlined-hover-icon-color [currentColor] - The hover color of a outlined button icon.
33-
/// @prop {Color} outlined-focus-icon-color [currentColor] - The focus color of a outlined button icon.
31+
/// @prop {Color} outlined-icon-color ["'currentColor'"] - The color of a outlined button icon.
32+
/// @prop {Color} outlined-hover-icon-color ["'currentColor'"] - The hover color of a outlined button icon.
33+
/// @prop {Color} outlined-focus-icon-color ["'currentColor'"] - The focus color of a outlined button icon.
3434
///
3535
/// @prop {Map} raised-background [igx-color: ('secondary', 500)] - The background color of an raised button.
3636
/// @prop {Map} raised-text-color [igx-contrast-color: ('secondary', 500)] - The idle text color of a raised button.
3737
/// @prop {Map} raised-hover-background [igx-color: ('secondary', 300)] - The hover background of a raised button.
3838
/// @prop {Map} raised-hover-text-color [igx-contrast-color: ('secondary', 300)] - The hover text color of a raised button.
3939
/// @prop {Map} raised-focus-background [igx-color: ('secondary', 300)] - The focus background color of a raised button.
4040
/// @prop {Map} raised-focus-text-color [igx-contrast-color: ('secondary', 300)] - The focus text color of a raised button.
41-
/// @prop {Color} raised-icon-color [currentColor] - The color of a raised button icon.
42-
/// @prop {Color} raised-hover-icon-color [currentColor] - The hover color of a raised button icon.
43-
/// @prop {Color} raised-focus-icon-color [currentColor] - The focus color of a raised button icon.
41+
/// @prop {Color} raised-icon-color ["'currentColor'"] - The color of a raised button icon.
42+
/// @prop {Color} raised-hover-icon-color ["'currentColor'"] - The hover color of a raised button icon.
43+
/// @prop {Color} raised-focus-icon-color ["'currentColor'"] - The focus color of a raised button icon.
4444
///
4545
/// @prop {Map} fab-background [igx-color: ('secondary', 500)] - The background color of a floating action button.
4646
/// @prop {Map} fab-text-color [igx-contrast-color: ('secondary', 500)] - The text color of a floating action button.
@@ -86,17 +86,17 @@ $_light-button: extend(
8686
igx-color: ('secondary', 500)
8787
),
8888

89-
flat-icon-color: currentColor,
90-
flat-hover-icon-color: currentColor,
91-
flat-focus-icon-color: currentColor,
89+
flat-icon-color: "'currentColor'",
90+
flat-hover-icon-color: "'currentColor'",
91+
flat-focus-icon-color: "'currentColor'",
9292

93-
raised-icon-color: currentColor,
94-
raised-hover-icon-color: currentColor,
95-
raised-focus-icon-color: currentColor,
93+
raised-icon-color: "'currentColor'",
94+
raised-hover-icon-color: "'currentColor'",
95+
raised-focus-icon-color: "'currentColor'",
9696

97-
outlined-icon-color: currentColor,
98-
outlined-hover-icon-color: currentColor,
99-
outlined-focus-icon-color: currentColor,
97+
outlined-icon-color: "'currentColor'",
98+
outlined-hover-icon-color: "'currentColor'",
99+
outlined-focus-icon-color: "'currentColor'",
100100

101101
flat-hover-background: (
102102
igx-color: ('secondary', 500),

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_chip.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
/// @prop {Map} focus-selected-background [igx-color: ('grays', 400)] - The selected chip focus background color.
3131
/// @prop {Color} focus-selected-border-color [transparent] - The selected chip focus border color.
3232
/// @prop {Number} ghost-elevation [8] - The elevation level for the chip's ghost (dragging mode). Between 0-24.
33-
/// @prop {color} remove-icon-color [currentColor] - The remove icon color for the chip.
33+
/// @prop {color} remove-icon-color ["'currentColor'"] - The remove icon color for the chip.
3434
/// @prop {Map} remove-icon-color-focus [igx-color: ('error')] - The remove icon color on focus for the chip.
3535
/// @prop {color} $focus-border-color [transparent] - The chip focus border color.
3636
///
@@ -44,7 +44,7 @@ $_light-chip: extend(
4444
(
4545
variant:'material',
4646

47-
remove-icon-color: currentColor,
47+
remove-icon-color: "'currentColor'",
4848

4949
remove-icon-color-focus: (
5050
igx-color: ('error')

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid-summary.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
/// @property {Map} focus-background-color [igx-color: ('grays', 100)] - The background color when a summary item is on focus.
1414
/// @property {map} label-color [igx-color: ('primary', 500)] - The summaries label color.
1515
/// @property {map} label-hover-color [igx-color: ('primary', 700)] - The summaries hover label color.
16-
/// @property {Color} result-color [currentColor] - The summaries value/result color.
16+
/// @property {Color} result-color ["'currentColor'"] - The summaries value/result color.
1717
/// @property {map} border-color [igx-color: ('grays', 400)] - The summaries border color.
1818
/// @property {String} pinned-border-width [2px] - The border width of the summary panel.
1919
/// @property {String} pinned-border-style [solid] - The border style of the summary panel.
@@ -38,7 +38,7 @@ $_light-grid-summary: extend(
3838
igx-color: ('primary', 700)
3939
),
4040

41-
result-color: currentColor,
41+
result-color: "'currentColor'",
4242

4343
border-color: (
4444
igx-color: ('grays', 400)

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_icon.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
/// Generates a light icon schema.
1010
/// @type {Map}
1111
///
12-
/// @property {Color} color [currentColor] - The icon color.
12+
/// @property {Color} color ["'currentColor'"] - The icon color.
1313
/// @property {String} size [rem(24px)] - The icon size.
14-
/// @property {Color} disabled-color [currentColor] - The disabled icon color.
14+
/// @property {Color} disabled-color ["'currentColor'"] - The disabled icon color.
1515
///
1616
/// @see $default-palette
1717

1818
$_light-icon: (
19-
color: currentColor,
19+
color: "'"'currentColor'"'",
2020
size: rem(24px),
21-
disabled-color: currentColor
21+
disabled-color: "'currentColor'"
2222
);
2323

2424
/// Generates a fluent icon schema.

projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_list.scss

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,21 +21,21 @@
2121
/// @property {Map} item-text-color-hover [igx-color: 'surface', text-contrast: (), rgba: .74] - The list item text color.
2222
/// @property {Map} item-text-color-active [igx-color: 'surface', text-contrast: (), rgba: .74] - The active list item text color.
2323
///
24-
/// @property {Color} item-title-color [currentColor] - The list item title color.
25-
/// @property {Color} item-title-color-hover [currentColor] - The list item title hover color.
26-
/// @property {Color} item-title-color-active [currentColor] - The list item title active color.
24+
/// @property {Color} item-title-color ["'currentColor'"] - The list item title color.
25+
/// @property {Color} item-title-color-hover ["'currentColor'"] - The list item title hover color.
26+
/// @property {Color} item-title-color-active ["'currentColor'"] - The list item title active color.
2727
///
28-
/// @property {Color} item-subtitle-color [currentColor] - The list item subtitle color.
29-
/// @property {Color} item-subtitle-color-hover [currentColor] - The list item subtitle hover color.
30-
/// @property {Color} item-subtitle-color-active [currentColor] - The list item subtitle active color.
28+
/// @property {Color} item-subtitle-color ["'currentColor'"] - The list item subtitle color.
29+
/// @property {Color} item-subtitle-color-hover ["'currentColor'"] - The list item subtitle hover color.
30+
/// @property {Color} item-subtitle-color-active ["'currentColor'"] - The list item subtitle active color.
3131
///
32-
/// @property {Color} item-action-color [currentColor] - The list item action color.
33-
/// @property {Color} item-action-color-hover [currentColor] - The list item action hover color.
34-
/// @property {Color} item-action-color-active [currentColor] - The list item action active color.
32+
/// @property {Color} item-action-color ["'currentColor'"] - The list item action color.
33+
/// @property {Color} item-action-color-hover ["'currentColor'"] - The list item action hover color.
34+
/// @property {Color} item-action-color-active ["'currentColor'"] - The list item action active color.
3535
///
36-
/// @property {Color} item-thumbnail-color [currentColor] - The list item thumbnail color.
37-
/// @property {Color} item-thumbnail-color-hover [currentColor] - The list item thumbnail hover color.
38-
/// @property {Color} item-thumbnail-color-active [currentColor] - The list item thumbnail active color.
36+
/// @property {Color} item-thumbnail-color ["'currentColor'"] - The list item thumbnail color.
37+
/// @property {Color} item-thumbnail-color-hover ["'currentColor'"] - The list item thumbnail hover color.
38+
/// @property {Color} item-thumbnail-color-active ["'currentColor'"] - The list item thumbnail active color.
3939
///
4040
/// @prop {Number} border-radius [0] - The border radius fraction, between 0-1 to be used for list component.
4141
/// @prop {Number} item-border-radius [0] - The border radius fraction, between 0-1 to be used for list item.
@@ -88,29 +88,29 @@ $_light-list: extend(
8888
rgba: .74
8989
),
9090

91-
item-title-color: currentColor,
91+
item-title-color: "'currentColor'",
9292

93-
item-title-color-hover: currentColor,
93+
item-title-color-hover: "'currentColor'",
9494

95-
item-title-color-active: currentColor,
95+
item-title-color-active: "'currentColor'",
9696

97-
item-action-color: currentColor,
97+
item-action-color: "'currentColor'",
9898

99-
item-action-color-hover: currentColor,
99+
item-action-color-hover: "'currentColor'",
100100

101-
item-action-color-active: currentColor,
101+
item-action-color-active: "'currentColor'",
102102

103-
item-subtitle-color: currentColor,
103+
item-subtitle-color: "'currentColor'",
104104

105-
item-subtitle-color-hover: currentColor,
105+
item-subtitle-color-hover: "'currentColor'",
106106

107-
item-subtitle-color-active: currentColor,
107+
item-subtitle-color-active: "'currentColor'",
108108

109-
item-thumbnail-color: currentColor,
109+
item-thumbnail-color: "'currentColor'",
110110

111-
item-thumbnail-color-hover: currentColor,
111+
item-thumbnail-color-hover: "'currentColor'",
112112

113-
item-thumbnail-color-active: currentColor,
113+
item-thumbnail-color-active: "'currentColor'",
114114

115115
border-color: transparent,
116116

0 commit comments

Comments
 (0)