Skip to content

Commit ebcbadb

Browse files
authored
Merge pull request #1661 from IgniteUI/bug1599
fix(themes): uninitialized theme variables
2 parents 934d6e2 + e6c2530 commit ebcbadb

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@
110110

111111
fab-text-color: igx-contrast-color($palette, 'secondary', 500),
112112
fab-background: igx-color($palette, 'secondary', 500),
113-
fab-hover-text-color: null,
114-
fab-hover-background: null,
113+
fab-hover-text-color: igx-contrast-color($palette, 'secondary', 500),
114+
fab-hover-background: igx-color($palette, 'secondary', 400),
115115
fab-focus-background: igx-color($palette, 'secondary', 500),
116116
fab-focus-text-color: igx-contrast-color($palette, 'secondary', 500),
117117

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
) {
5252
$default-theme: (
5353
name: 'igx-grid-filtering',
54+
toggle-background: transparent,
5455
toggle-icon-color: inherit,
5556
toggle-icon-hover-color: #fff,
5657
toggle-icon-active-color: igx-contrast-color($palette, 'secondary'),
@@ -60,7 +61,8 @@
6061
toggle-filtered-background: transparent,
6162
menu-background: #fff,
6263
menu-text-color: igx-color($palette, 'grays', 900),
63-
menu-button-text-color: igx-color($palette, 'secondary')
64+
menu-button-text-color: igx-color($palette, 'secondary'),
65+
menu-button-disabled-text-color: initial
6466
);
6567

6668
@if not($menu-text-color) and $menu-background {
@@ -213,7 +215,7 @@
213215
color: --var($theme, 'menu-button-text-color');
214216

215217
&:disabled {
216-
color: --var($theme, 'menu-button-text-color');
218+
color: --var($theme, 'menu-button-disabled-text-color');
217219
}
218220
}
219221

projects/igniteui-angular/src/lib/core/styles/components/list/_list-theme.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@
3232
$default-theme: (
3333
name: 'igx-list',
3434
background: #fff,
35+
header-background: #fff,
3536
header-text-color: igx-color($palette, 'secondary'),
37+
item-background: #fff,
3638
item-text-color: igx-color($palette, 'grays', 800),
3739
item-background-active: igx-color($palette, 'grays', 100),
3840
item-text-color-active: igx-color($palette, 'grays', 800)

0 commit comments

Comments
 (0)