Skip to content

fix(grid): hovering selected row in dark theme is white #5963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 13, 2019
Merged

fix(grid): hovering selected row in dark theme is white #5963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be4b9ad
fix(grid): hovering selected row in dark theme is white
simeonoff Oct 10, 2019
b8e4526
Merge branch '8.2.x' into fix-5959
simeonoff Oct 10, 2019
5523216
Merge branch '8.2.x' into fix-5959
simeonoff Oct 10, 2019
17a6ad5
Merge branch '8.2.x' into fix-5959
simeonoff Oct 10, 2019
df6d0b4
Merge branch '8.2.x' into fix-5959
kdinev Oct 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions projects/igniteui-angular/src/lib/core/styles/themes/schemas/dark/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
/// @prop {Color} row-even-background [#222] - The background color of even rows.
/// @prop {Map} row-hover-background [igx-color: ('grays', 100), hexrgba: #222] - The hover row background color.
/// @prop {Map} row-selected-background [igx-color: ('secondary', 500), rgba: .24, hexrgba: #222] - The selected row background color.
/// @prop {Map} row-selected-hover-background [igx-color: ('secondary', 'A700'), rgba: .24, hexrgba: #222] - The selected row background color on hover.
/// @prop {Color} row-selected-text-color [#fff] - The selected row text color.
/// @prop {Color} ghost-header-background [#222] - The dragged header background color.
/// @prop {Color} cell-editing-background [#222] - The background for the cell in editing mode.
Expand Down Expand Up @@ -52,6 +53,12 @@ $_base-dark-grid: (
hexrgba: #222
),

row-selected-hover-background: (
igx-color: ('secondary', 'A700'),
rgba: .24,
hexrgba: #222
),

row-selected-text-color: #fff,

ghost-header-background: #222,
Expand Down
9 changes: 3 additions & 6 deletions projects/igniteui-angular/src/lib/core/styles/themes/schemas/light/_grid.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
/// @prop {Color} row-even-background [#fff] - The background color of even rows.
/// @prop {Color} row-odd-text-color [inherit] - The text color of odd rows.
/// @prop {Color} row-even-text-color [inherit] - The text color of even rows.
/// @prop {Map} row-selected-background [igx-color: ('secondary', 50), hexrgba: #fff] - The selected row background color.
/// @prop {Map} row-selected-background [igx-color: ('secondary', 50)] - The selected row background color.
/// @prop {Map} row-selected-text-color [igx-contrast-color: ('secondary', 50)] - The selected row text color.
/// @prop {Map} row-selected-hover-background [igx-color: ('secondary', 50), hexrgba: #fff] - The selected row hover background.
/// @prop {Map} row-selected-hover-background [igx-color: ('secondary', 50)] - The selected row hover background.
/// @prop {Map} row-hover-background [igx-color: ('grays', 100), hexrgba: #fff] - The hover row background color.
/// @prop {Map} row-hover-text-color [igx-contrast-color: ('grays', 200)] - The hover row text color.
/// @prop {Map} row-border-color [igx-color: ('grays', 300)] - The row bottom border color.
Expand Down Expand Up @@ -132,12 +132,10 @@ $_light-grid: extend(

row-selected-background: (
igx-color: ('secondary', 50),
hexrgba: #fff
),

row-selected-hover-background: (
igx-color: ('secondary', 50),
hexrgba: #fff
),

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

cell-active-border-color: (
igx-color: ('primary', 100),
hexrgba: #fff
),

cell-selected-background: (
Expand Down