Skip to content

Commit 0351166

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Apply review comments on styles.
1 parent b8a77e2 commit 0351166

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,9 @@
300300
@extend %igx-grid__td--merged !optional;
301301
}
302302

303+
@include e(td, $mods: (merged-selected, merged-hovered)) {
304+
@extend %igx-grid__td--merged-selected-hovered !optional;
305+
}
303306

304307
@include e(td, $m: merged-selected) {
305308
@extend %igx-grid__td--merged-selected !optional;

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

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,27 +1849,6 @@
18491849
color: var-get($theme, 'row-selected-text-color');
18501850
background: var-get($theme, 'row-selected-background');
18511851

1852-
&%grid-row--mrl {
1853-
%grid-mrl-block {
1854-
%igx-grid__td--merged {
1855-
color: var-get($theme, 'row-selected-text-color');
1856-
background: var-get($theme, 'row-selected-background');
1857-
1858-
&:hover {
1859-
background: var-get($theme, 'row-selected-hover-background');
1860-
color: var-get($theme, 'row-selected-hover-text-color');
1861-
}
1862-
1863-
&%igx-grid__td--merged-hovered {
1864-
background: var-get($theme, 'row-selected-hover-background');
1865-
color: var-get($theme, 'row-selected-hover-text-color');
1866-
}
1867-
}
1868-
}
1869-
}
1870-
1871-
1872-
18731852
%grid-cell--selected,
18741853
%grid-cell--pinned-selected {
18751854
color: var-get($theme, 'cell-selected-within-text-color');
@@ -1925,21 +1904,16 @@
19251904
%igx-grid__td--merged-selected {
19261905
color: var-get($theme, 'row-selected-text-color');
19271906
background: var-get($theme, 'row-selected-background');
1928-
1929-
&%igx-grid__td--merged-hovered {
1930-
background: var-get($theme, 'row-selected-hover-background');
1931-
color: var-get($theme, 'row-selected-hover-text-color');
1932-
}
19331907
}
19341908

19351909
%igx-grid__td--merged-hovered {
19361910
background: var-get($theme, 'row-hover-background');
19371911
color: var-get($theme, 'row-hover-text-color');
1912+
}
19381913

1939-
&%igx-grid__td--merged-selected {
1940-
background: var-get($theme, 'row-selected-hover-background');
1941-
color: var-get($theme, 'row-selected-hover-text-color');
1942-
}
1914+
%igx-grid__td--merged-selected-hovered {
1915+
background: var-get($theme, 'row-selected-hover-background');
1916+
color: var-get($theme, 'row-selected-hover-text-color');
19431917
}
19441918

19451919
%igx-grid__tr--deleted {

0 commit comments

Comments
 (0)