Skip to content

Commit 0ae3b68

Browse files
Merge branch '9.0.x' into astaev/issue1703-9.0.x
2 parents edd4491 + eae5c86 commit 0ae3b68

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
/// @param {Color} $drop-indicator-color [null] - The color applied to the line between the columns when dragging a column.
5757
///
5858
/// @param {Color} $grouparea-background [null] - The grid group area background color.
59+
/// @param {Color} $grouparea-color [null] - The grid group area color.
5960
///
6061
/// @param {Color} $group-row-background [null] - The grid group row background color.
6162
/// @param {Color} $group-row-selected-background [null] - The drop area background on drop color.
@@ -162,6 +163,7 @@
162163
$drop-indicator-color: null,
163164
164165
$grouparea-background: null,
166+
$grouparea-color: null,
165167
166168
$group-row-background: null,
167169
$group-row-selected-background: null,
@@ -366,10 +368,20 @@
366368
$grouparea-background: $header-background
367369
}
368370

371+
@if not($grouparea-color) and $grouparea-background {
372+
$grouparea-color: rgba(text-contrast($grouparea-background), .8)
373+
}
374+
375+
@if not($grouparea-color) and $header-background {
376+
$grouparea-color: rgba(text-contrast($header-background), .8)
377+
}
378+
369379
@if not($drop-area-background) and $grouparea-background {
370380
$drop-area-background: text-contrast($grouparea-background);
371381
}
372382

383+
384+
373385
@if not($drop-area-on-drop-background) and $drop-area-background {
374386
$drop-area-on-drop-background: $drop-area-background;
375387
}
@@ -472,6 +484,8 @@
472484
drop-indicator-color: $drop-indicator-color,
473485

474486
grouparea-background: $grouparea-background,
487+
grouparea-color: $grouparea-color,
488+
475489
group-label-column-name-text: $group-label-column-name-text,
476490
group-label-icon: $group-label-icon,
477491
group-label-text: $group-label-text,
@@ -1877,6 +1891,7 @@
18771891
flex-wrap: wrap;
18781892
border-bottom: $grid-header-border;
18791893
background: --var($theme, 'grouparea-background');
1894+
color: --var($theme, 'grouparea-color');
18801895
min-height: map-get($grouparea-min-height, 'comfortable');
18811896
padding: map-get($grouparea-padding, 'comfortable');
18821897
z-index: 2;

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
/// @prop {Map} resize-line-color [igx-color: ('secondary', 500)] - The table header resize line color.
4949
/// @prop {Map} drop-indicator-color [igx-color: ('secondary', 500)] - The color of the drop indicator.
5050
/// @prop {Map} grouparea-background [igx-color: ('grays', 100), hexrgba: #fff] - The grid group area background color.
51+
/// @prop {map} grouparea-color [igx-color: ('grays', 500)] - The grid group area color.
5152
/// @prop {Map} group-row-background [igx-color: ('grays', 100), hexrgba: #fff] - The grid group row background color.
5253
/// @prop {Map} group-row-selected-background [igx-color: ('grays', 200), hexrgba: #fff] - The drop area background on drop color.
5354
/// @prop {Map} active-expand-icon-color [igx-color: ('grays', 500)] - The drop area background on drop color.
@@ -96,6 +97,10 @@ $_light-grid: extend(
9697
(
9798
variant: 'material',
9899

100+
grouparea-color: (
101+
igx-color: ('grays', 500)
102+
),
103+
99104
filtering-background-and: (
100105
igx-color: ('primary', 300)
101106
),

0 commit comments

Comments
 (0)