Skip to content

Commit ce9218c

Browse files
authored
Merge pull request #5963 from IgniteUI/fix-5959
fix(grid): hovering selected row in dark theme is white
2 parents b6fbbc4 + df6d0b4 commit ce9218c

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
/// @prop {Color} row-even-background [#222] - The background color of even rows.
1414
/// @prop {Map} row-hover-background [igx-color: ('grays', 100), hexrgba: #222] - The hover row background color.
1515
/// @prop {Map} row-selected-background [igx-color: ('secondary', 500), rgba: .24, hexrgba: #222] - The selected row background color.
16+
/// @prop {Map} row-selected-hover-background [igx-color: ('secondary', 'A700'), rgba: .24, hexrgba: #222] - The selected row background color on hover.
1617
/// @prop {Color} row-selected-text-color [#fff] - The selected row text color.
1718
/// @prop {Color} ghost-header-background [#222] - The dragged header background color.
1819
/// @prop {Color} cell-editing-background [#222] - The background for the cell in editing mode.
@@ -52,6 +53,12 @@ $_base-dark-grid: (
5253
hexrgba: #222
5354
),
5455

56+
row-selected-hover-background: (
57+
igx-color: ('secondary', 'A700'),
58+
rgba: .24,
59+
hexrgba: #222
60+
),
61+
5562
row-selected-text-color: #fff,
5663

5764
ghost-header-background: #222,

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
/// @prop {Color} row-even-background [#fff] - The background color of even rows.
2828
/// @prop {Color} row-odd-text-color [inherit] - The text color of odd rows.
2929
/// @prop {Color} row-even-text-color [inherit] - The text color of even rows.
30-
/// @prop {Map} row-selected-background [igx-color: ('secondary', 50), hexrgba: #fff] - The selected row background color.
30+
/// @prop {Map} row-selected-background [igx-color: ('secondary', 50)] - The selected row background color.
3131
/// @prop {Map} row-selected-text-color [igx-contrast-color: ('secondary', 50)] - The selected row text color.
32-
/// @prop {Map} row-selected-hover-background [igx-color: ('secondary', 50), hexrgba: #fff] - The selected row hover background.
32+
/// @prop {Map} row-selected-hover-background [igx-color: ('secondary', 50)] - The selected row hover background.
3333
/// @prop {Map} row-hover-background [igx-color: ('grays', 100), hexrgba: #fff] - The hover row background color.
3434
/// @prop {Map} row-hover-text-color [igx-contrast-color: ('grays', 200)] - The hover row text color.
3535
/// @prop {Map} row-border-color [igx-color: ('grays', 300)] - The row bottom border color.
@@ -132,12 +132,10 @@ $_light-grid: extend(
132132

133133
row-selected-background: (
134134
igx-color: ('secondary', 50),
135-
hexrgba: #fff
136135
),
137136

138137
row-selected-hover-background: (
139138
igx-color: ('secondary', 50),
140-
hexrgba: #fff
141139
),
142140

143141
row-selected-text-color: (
@@ -334,7 +332,7 @@ $_light-grid: extend(
334332
/// @prop {Map} row-selected-hover-background [igx-color: ('grays', 200), hexrgba: #fff] - The selected row hover background.
335333
/// @prop {Map} row-border-color [igx-color: ('grays', 100)] - The row bottom border color.
336334
/// @prop {Map} pinned-border-color [igx-color: ('grays', 200)] - The color of the pinned border.
337-
/// @prop {Map} cell-active-border-color [igx-color: ('primary', 100), hexrgba: #fff] - The active(focused) cell border color.
335+
/// @prop {Map} cell-active-border-color [igx-color: ('primary', 100)] - The active(focused) cell border color.
338336
/// @prop {Map} cell-selected-background [igx-color: ('grays', 300), hexrgba: #fff] - The selected cell background color.
339337
/// @prop {Map} grouparea-background [igx-color: 'surface'] - The grid group area background color.
340338
/// @prop {Map} group-row-background [igx-color: ('grays', 50), hexrgba: #fff] - The grid group row background color.
@@ -385,7 +383,6 @@ $_fluent-grid: extend(
385383

386384
cell-active-border-color: (
387385
igx-color: ('primary', 100),
388-
hexrgba: #fff
389386
),
390387

391388
cell-selected-background: (

0 commit comments

Comments
 (0)