Skip to content

Commit 15cb1fc

Browse files
authored
Merge pull request #7201 from IgniteUI/mpopov/active-styles
fix(grid): Adding active styles for summaries, group row and header
2 parents de03ea1 + f13b418 commit 15cb1fc

File tree

2 files changed

+35
-4
lines changed

2 files changed

+35
-4
lines changed

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,10 @@
212212
@extend %igx-grid__tr-container !optional;
213213
}
214214

215+
@include e(tr-container, $m: active) {
216+
@extend %igx-grid__tr-container--active !optional;
217+
}
218+
215219
@include e(th) {
216220
@extend %grid-cell-display !optional;
217221
@extend %grid-cell-header !optional;
@@ -253,6 +257,10 @@
253257
@extend %igx-grid__th--selected !optional;
254258
}
255259

260+
@include e(th, $m: active) {
261+
@extend %igx-grid__th--active !optional;
262+
}
263+
256264
@include e(th, $m: number) {
257265
@extend %grid-cell-number !optional;
258266
}
@@ -798,7 +806,7 @@
798806
@include e(hierarchical-expander) {
799807
@extend %igx-grid__hierarchical-expander--compact !optional;
800808
}
801-
809+
802810
@include e(hierarchical-expander, $m: empty) {
803811
@extend %igx-grid__hierarchical-expander--compact !optional;
804812
@extend %igx-grid__hierarchical-expander--empty !optional;
@@ -874,3 +882,9 @@
874882
@extend %igx-group-label__count-badge !optional;
875883
}
876884
}
885+
886+
@include b(igx-grid-summary) {
887+
@include m(active) {
888+
@extend %igx-grid-summary--active !optional;
889+
}
890+
}

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

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,7 @@
732732
background: --var($theme, 'header-background');
733733
color: --var($theme, 'header-text-color');
734734
overflow: hidden;
735+
outline-style: none;
735736

736737
%grid-row {
737738
position: relative;
@@ -918,6 +919,7 @@
918919
color: --var($theme, 'content-text-color');
919920
overflow: hidden;
920921
z-index: 1;
922+
outline-style: none;
921923
}
922924

923925
%grid-tbody-container {
@@ -1322,8 +1324,6 @@
13221324
// border-bottom: 0;
13231325

13241326
%igx-grid__tree-grouping-indicator {
1325-
color: --var($theme, 'cell-selected-text-color');
1326-
13271327
&:hover {
13281328
color: --var($theme, 'cell-selected-text-color');
13291329
}
@@ -1543,6 +1543,19 @@
15431543
background: --var($theme, 'header-selected-background');
15441544
}
15451545

1546+
%igx-grid__th--active {
1547+
@extend %grid-cell--active;
1548+
1549+
%igx-grid__th--selected,
1550+
%igx-grid__th--selectable {
1551+
@extend %grid-cell--active
1552+
}
1553+
}
1554+
1555+
%igx-grid-summary--active {
1556+
@extend %grid-cell--active
1557+
}
1558+
15461559
%igx-grid__th--sortable {
15471560
.sort-icon {
15481561
cursor: pointer;
@@ -1842,6 +1855,7 @@
18421855

18431856
%igx-grid__group-row--active {
18441857
background: --var($theme, 'group-row-selected-background');
1858+
@extend %grid-cell--active;
18451859

18461860
%igx-grid__grouping-indicator {
18471861
color: --var($theme, 'expand-icon-color');
@@ -2092,7 +2106,6 @@
20922106
user-select: none;
20932107
justify-content: center;
20942108
align-items: center;
2095-
background: inherit;
20962109
z-index: 1;
20972110
cursor: pointer;
20982111
padding-#{$left}: map-get($grid-grouping-indicator-padding, 'comfortable');
@@ -2484,6 +2497,10 @@
24842497
border-bottom: 1px solid --var($theme, 'row-border-color');
24852498
}
24862499

2500+
%igx-grid__tr-container--active {
2501+
@extend %grid-cell--active;
2502+
}
2503+
24872504
%igx-grid__hierarchical-expander {
24882505
user-select: none;
24892506
background: inherit;

0 commit comments

Comments
 (0)