Skip to content

Commit febbd43

Browse files
MKirovaMKirova
authored andcommitted
chore(*): Extract hardcoded styles in class.
1 parent 4667bb0 commit febbd43

File tree

3 files changed

+14
-7
lines changed

3 files changed

+14
-7
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,10 @@
296296
@extend %igx-grid__td--edited !optional;
297297
}
298298

299+
@include e(td, $m: merged) {
300+
@extend %igx-grid__td--merged !optional;
301+
}
302+
299303
@include e(td, $m: editing) {
300304
@extend %igx-grid__td--editing !optional;
301305
}

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1872,6 +1872,11 @@
18721872
}
18731873
}
18741874

1875+
%igx-grid__td--merged {
1876+
z-index: 1;
1877+
grid-row: 1 / -1;
1878+
}
1879+
18751880
%igx-grid__tr--deleted {
18761881
%grid-cell-text {
18771882
font-style: italic;
@@ -2084,7 +2089,7 @@
20842089

20852090
.sort-icon {
20862091
color: var-get($theme, 'header-selected-text-color');
2087-
2092+
20882093
::after {
20892094
background: var-get($theme, 'header-selected-background');
20902095
}
@@ -2112,15 +2117,15 @@
21122117
&%igx-grid-th--sorted {
21132118
.sort-icon {
21142119
color: var-get($theme, 'header-selected-text-color');
2115-
2120+
21162121
> igx-icon {
21172122
color: inherit;
21182123
}
21192124

21202125
&:focus,
21212126
&:hover {
21222127
color: var-get($theme, 'header-selected-text-color');
2123-
2128+
21242129
> igx-icon {
21252130
color: inherit;
21262131
}
@@ -2177,14 +2182,14 @@
21772182
.sort-icon {
21782183
opacity: 1;
21792184
color: var-get($theme, 'sorted-header-icon-color');
2180-
2185+
21812186
> igx-icon {
21822187
color: inherit;
21832188
}
21842189

21852190
&:hover {
21862191
color: var-get($theme, 'sortable-header-icon-hover-color');
2187-
2192+
21882193
> igx-icon {
21892194
color: inherit;
21902195
}

projects/igniteui-angular/src/lib/grids/grid/grid-row.component.html

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,6 @@
195195
[active]="isCellActive(col.visibleIndex)"
196196
[cellSelectionMode]="grid.cellSelection"
197197
[displayPinnedChip]="shouldDisplayPinnedChip(col.visibleIndex)"
198-
[style.gridRow]="'1 / -1'"
199-
[style.zIndex]="data.cellMergeMeta.get(col.field).rowSpan"
200198
[style.min-width]="col.resolvedWidth"
201199
[style.max-width]="col.resolvedWidth"
202200
[style.flex-basis]="col.resolvedWidth"

0 commit comments

Comments
 (0)