Skip to content

Commit 367e9db

Browse files
authored
refactor(grid): update bootstrap colors (#511)
1 parent 6d45f5b commit 367e9db

File tree

2 files changed

+18
-35
lines changed

2 files changed

+18
-35
lines changed

sass/themes/schemas/components/dark/_grid.scss

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
/// @prop {Map} cell-selected-within-background [color: ('secondary', 'A400')] - The background of the selected cell inside a selected row/column.
3030
/// @prop {Map} cell-selected-within-text-color [contrast-color: ('secondary', 'A400')] - The color of the selected cell inside a selected row/column.
3131
/// @prop {Map} grouparea-background [color: ('gray', 50)] - The grid group area background color.
32+
/// @prop {Map} grouparea-color [color: ('gray', 500)] - The grid group area color.
3233
/// @prop {Map} group-row-background [color: ('gray', 50)] - The grid group row background color.
3334
/// @prop {Map} group-row-selected-background [color: ('gray', 100)] - The drop area background on drop color.
3435
$base-dark-grid: (
@@ -172,6 +173,13 @@ $base-dark-grid: (
172173
),
173174
),
174175

176+
grouparea-color: (
177+
color: (
178+
'gray',
179+
500,
180+
),
181+
),
182+
175183
group-row-background: (
176184
color: (
177185
'gray',
@@ -190,7 +198,6 @@ $base-dark-grid: (
190198
/// Generates a dark material grid schema based on a mix of $material-grid and $base-dark-grid.
191199
/// @type {Map}
192200
/// @prop {Map} header-text-color [color: ('gray', 800, .7)] - The table header text color.
193-
/// @prop {Map} grouparea-color [color: ('gray', 500)] - The grid group area color.
194201
/// @prop {Map} group-label-column-name-text [color: ('primary', 500)] - The grid group row column name text color.
195202
/// @prop {Map} group-label-icon [color: ('primary', 500)] - The grid group row icon color.
196203
/// @prop {Map} group-count-text-color [color: ('gray', 600)] - The grid group row cont badge text color.
@@ -209,13 +216,6 @@ $dark-material-grid: extend(
209216
),
210217
),
211218

212-
grouparea-color: (
213-
color: (
214-
'gray',
215-
500,
216-
),
217-
),
218-
219219
group-label-column-name-text: (
220220
color: (
221221
'primary',
@@ -260,7 +260,6 @@ $dark-material-grid: extend(
260260
/// @prop {Map} row-selected-hover-text-color [contrast-color: ('gray', 200)] - The selected row hover text color.
261261
/// @prop {Map} cell-selected-within-background [color: ('gray', 200)] - The background of the selected cell inside a selected row/column.
262262
/// @prop {Map} cell-selected-within-text-color [contrast-color: ('gray', 200)] - The color of the selected cell inside a selected row/column.
263-
/// @prop {Map} grouparea-color [color: ('gray', 500)] - The grid group area color.
264263
/// @prop {Map} group-row-background [color: ('gray', 100, .5)] - The grid group row background color.
265264
/// @prop {Map} group-count-text-color [color: ('gray', 600)] - The grid group row cont badge text color.
266265
/// @requires $fluent-grid
@@ -326,13 +325,6 @@ $dark-fluent-grid: extend(
326325
),
327326
),
328327

329-
grouparea-color: (
330-
color: (
331-
'gray',
332-
500,
333-
),
334-
),
335-
336328
group-row-background: (
337329
color: (
338330
'gray',
@@ -366,7 +358,6 @@ $dark-fluent-grid: extend(
366358
/// @prop {Map} content-background [color: ('gray', 50)] - The table body background color.
367359
/// @prop {Map} drop-area-background [color: ('gray', 100, .5)] - The drop area background color.
368360
/// @prop {Map} grouparea-background [color: 'surface'] - The grid group area background color.
369-
/// @prop {Map} grouparea-color [contrast-color: 'surface'] - The grid group area color.
370361
/// @prop {Map} summaries-patch-background [color: ('gray', 100)] - The leading summaries patch backround. Used in hierarchical grids.
371362
/// @requires $bootstrap-grid
372363
/// @requires $base-dark-grid

sass/themes/schemas/components/light/_grid.scss

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
/// @prop {Map} resize-line-color [color: ('secondary', 500)] - The table header resize line color.
5050
/// @prop {Map} drop-indicator-color [color: ('secondary', 500)] - The color of the drop indicator.
5151
/// @prop {Map} grouparea-background [color: ('gray', 100)] - The grid group area background color.
52-
/// @prop {Map} grouparea-color [color: ('gray', 500)] - The grid group area color.
52+
/// @prop {Map} grouparea-color [color: ('gray', 600)] - The grid group area color.
5353
/// @prop {Map} group-row-background [color: ('gray', 100)] - The grid group row background color.
5454
/// @prop {Map} group-row-selected-background [color: ('gray', 200)] - The drop area background on drop color.
5555
/// @prop {Map} active-expand-icon-color [color: ('gray', 500)] - The drop area background on drop color.
@@ -97,7 +97,7 @@ $light-grid: extend(
9797
grouparea-color: (
9898
color: (
9999
'gray',
100-
500,
100+
600,
101101
),
102102
),
103103

@@ -611,7 +611,6 @@ $light-grid: extend(
611611
/// @prop {Map} row-selected-hover-background [color: ('secondary', 100)] - The selected row hover background.
612612
/// @prop {Map} row-selected-hover-text-color [contrast-color: ('secondary', 100)] - The selected row hover text color.
613613
/// @prop {Map} cell-active-border-color [color: ('secondary', 500)] - The active(focused) cell border color.
614-
/// @prop {Map} grouparea-color [color: ('gray', 600)] - The grid group area color.
615614
/// @prop {Map} group-label-column-name-text [color: ('primary', 800)] - The grid group row column name text color.
616615
/// @prop {Map} group-label-icon [color: ('primary', 800)] - The grid group row icon color.
617616
/// @prop {Map} group-count-text-color [color: ('gray', 700)] - The grid group row cont badge text color.
@@ -692,13 +691,6 @@ $material-grid: extend(
692691
),
693692
),
694693

695-
grouparea-color: (
696-
color: (
697-
'gray',
698-
600,
699-
),
700-
),
701-
702694
group-label-column-name-text: (
703695
color: (
704696
'primary',
@@ -740,7 +732,6 @@ $material-grid: extend(
740732
/// @prop {Map} pinned-border-color [color: ('gray', 200)] - The color of the pinned border.
741733
/// @prop {Map} cell-active-border-color [color: ('primary', 100)] - The active(focused) cell border color.
742734
/// @prop {Map} grouparea-background [color: 'surface'] - The grid group area background color.
743-
/// @prop {Map} grouparea-color [color: ('gray', 600)] - The grid group area color.
744735
/// @prop {Map} group-row-background [color: ('gray', 50)] - The grid group row background color.
745736
/// @prop {Map} group-row-selected-background [color: ('gray', 100)] - The drop area background on drop color.
746737
/// @prop {Map} group-count-text-color [color: ('gray', 700)] - The grid group row cont badge text color.
@@ -838,13 +829,6 @@ $fluent-grid: extend(
838829
color: 'surface',
839830
),
840831

841-
grouparea-color: (
842-
color: (
843-
'gray',
844-
600,
845-
),
846-
),
847-
848832
group-row-background: (
849833
color: (
850834
'gray',
@@ -1127,6 +1111,7 @@ $bootstrap-grid: extend(
11271111
/// @prop {Map} cell-editing-background [color: ('gray' 200)] - The background for the cell in editing mode.
11281112
/// @prop {Map} row-selected-hover-text-color [color: ('gray', 900)] - The selected row hover text color.
11291113
/// @prop {Map} grouparea-background [color: ('surface', 500)] - The grid group area background color.
1114+
/// @prop {Map} grouparea-color [color: ('gray', 500)] - The grid group area color.
11301115
/// @prop {Map} drop-area-background [color: ('gray', 200)] - The drop area background color.
11311116
/// @prop {Map} row-hover-text-color [color: ('gray', 900)] - The hover row text color.
11321117
/// @prop {Map} row-selected-text-color [color: ('gray', 900)] - The selected row text color.
@@ -1433,6 +1418,13 @@ $indigo-grid: extend(
14331418
),
14341419
),
14351420

1421+
grouparea-color: (
1422+
color: (
1423+
'gray',
1424+
500,
1425+
),
1426+
),
1427+
14361428
drop-area-background: (
14371429
color: (
14381430
'gray',

0 commit comments

Comments
 (0)