Skip to content

Commit deacb5e

Browse files
authored
CardView - ThemeBuilder - remove 'header items gap' option and change Card background color inheritance for Generic and Material themes (DevExpress#30111)
1 parent 986a86d commit deacb5e

File tree

7 files changed

+16
-35
lines changed

7 files changed

+16
-35
lines changed

packages/devextreme-scss/scss/widgets/base/cardView/_index.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
display: flex;
3232
flex-direction: column;
3333
gap: $cardview-header-gap;
34+
35+
.dx-toolbar {
36+
background-color: transparent;
37+
}
3438
}
3539

3640
.dx-cardview-exclude-flexbox {

packages/devextreme-scss/scss/widgets/base/cardView/content_view/content/card/header/_index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
.dx-toolbar {
1010
padding: 0 12px;
1111
border-radius: $cardview-card-border-radius $cardview-card-border-radius 0 0;
12+
background-color: transparent;
1213

1314
.dx-toolbar-label {
1415
font-size: $cardview-card__header-text-size;

packages/devextreme-scss/scss/widgets/fluent/cardView/_sizes.scss

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,13 @@ $cardview-fluent-common-border-radius: null !default;
2929
$cardview-fluent-common-text-weight: null !default;
3030

3131
/**
32-
* $name 105. Gap between header items
33-
* $type text
34-
*/
35-
$cardview-fluent-common-header-panel-gap: null !default;
36-
37-
/**
38-
* $name 106. Vertical gap between cards
32+
* $name 105. Vertical gap between cards
3933
* $type text
4034
*/
4135
$cardview-fluent-common-cards-row-gap: null !default;
4236

4337
/**
44-
* $name 107. Horizontal gap between cards
38+
* $name 106. Horizontal gap between cards
4539
* $type text
4640
*/
4741
$cardview-fluent-common-cards-column-gap: null !default;
@@ -269,7 +263,6 @@ $cardview-fluent-column-chooser__select-all-item-horizontal-padding: null !defau
269263
// Common
270264
$cardview-fluent-common-border-radius: 16px !default;
271265
$cardview-fluent-common-text-weight: 400 !default;
272-
$cardview-fluent-common-header-panel-gap: 8px !default;
273266
$cardview-fluent-common-cards-row-gap: 16px !default;
274267
$cardview-fluent-common-cards-column-gap: 16px !default;
275268
$cardview-fluent-common-gap: 24px !default;
@@ -352,7 +345,6 @@ $cardview-fluent-column-chooser__select-all-item-horizontal-padding: null !defau
352345
// Common
353346
$cardview-fluent-common-border-radius: 16px !default;
354347
$cardview-fluent-common-text-weight: 400 !default;
355-
$cardview-fluent-common-header-panel-gap: 4px !default;
356348
$cardview-fluent-common-cards-row-gap: 12px !default;
357349
$cardview-fluent-common-cards-column-gap: 12px !default;
358350
$cardview-fluent-common-gap: 16px !default;

packages/devextreme-scss/scss/widgets/generic/cardView/_colors.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ $cardview-generic-columnchooser--empty__message-color: null !default;
408408
$cardview-generic-common-text-color: $base-text-color !default;
409409

410410
// Card
411-
$cardview-generic-card-bg-color: $cardview-generic-common-bg-color !default;
411+
$cardview-generic-card-bg-color: $base-bg !default;
412412
$cardview-generic-card-border-color: $base-border-color !default;
413413
$cardview-generic-card-divider-color: $cardview-generic-card-border-color !default;
414414
$cardview-generic-card-text-color: $cardview-generic-common-text-color !default;
@@ -492,7 +492,7 @@ $cardview-generic-columnchooser--empty__message-color: null !default;
492492
$cardview-generic-common-text-color: $base-text-color !default;
493493

494494
// Card
495-
$cardview-generic-card-bg-color: $cardview-generic-common-bg-color !default;
495+
$cardview-generic-card-bg-color: $base-bg !default;
496496
$cardview-generic-card-border-color: $base-border-color !default;
497497
$cardview-generic-card-divider-color: $cardview-generic-card-border-color !default;
498498
$cardview-generic-card-text-color: $cardview-generic-common-text-color !default;
@@ -576,7 +576,7 @@ $cardview-generic-columnchooser--empty__message-color: null !default;
576576
$cardview-generic-common-text-color: $base-text-color !default;
577577

578578
// Card
579-
$cardview-generic-card-bg-color: $cardview-generic-common-bg-color !default;
579+
$cardview-generic-card-bg-color: $base-bg !default;
580580
$cardview-generic-card-border-color: $base-border-color !default;
581581
$cardview-generic-card-divider-color: $cardview-generic-card-border-color !default;
582582
$cardview-generic-card-text-color: $cardview-generic-common-text-color !default;

packages/devextreme-scss/scss/widgets/generic/cardView/_sizes.scss

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,13 @@ $cardview-generic-common-border-radius: null !default;
2929
$cardview-generic-common-text-weight: null !default;
3030

3131
/**
32-
* $name 105. Gap between header items
33-
* $type text
34-
*/
35-
$cardview-generic-common-header-panel-gap: null !default;
36-
37-
/**
38-
* $name 106. Vertical gap between cards
32+
* $name 105. Vertical gap between cards
3933
* $type text
4034
*/
4135
$cardview-generic-common-cards-row-gap: null !default;
4236

4337
/**
44-
* $name 107. Horizontal gap between cards
38+
* $name 106. Horizontal gap between cards
4539
* $type text
4640
*/
4741
$cardview-generic-common-cards-column-gap: null !default;
@@ -271,7 +265,6 @@ $cardview-generic-column-chooser__select-all-item-horizontal-padding: null !defa
271265
// Common
272266
$cardview-generic-common-border-radius: 16px !default;
273267
$cardview-generic-common-text-weight: 400 !default;
274-
$cardview-generic-common-header-panel-gap: 8px !default;
275268
$cardview-generic-common-cards-row-gap: 16px !default;
276269
$cardview-generic-common-cards-column-gap: 16px !default;
277270
$cardview-generic-common-gap: 20px !default;
@@ -355,7 +348,6 @@ $cardview-generic-column-chooser__select-all-item-horizontal-padding: null !defa
355348
// Common
356349
$cardview-generic-common-border-radius: 16px !default;
357350
$cardview-generic-common-text-weight: 400 !default;
358-
$cardview-generic-common-header-panel-gap: 4px !default;
359351
$cardview-generic-common-cards-row-gap: 12px !default;
360352
$cardview-generic-common-cards-column-gap: 12px !default;
361353
$cardview-generic-common-gap: 16px !default;

packages/devextreme-scss/scss/widgets/material/cardView/_colors.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ $cardview-material-columnchooser--empty__message-color: null !default;
408408
$cardview-material-common-text-color: $base-text-color !default;
409409

410410
// Card
411-
$cardview-material-card-bg-color: $cardview-material-common-bg-color !default;
411+
$cardview-material-card-bg-color: $base-bg !default;
412412
$cardview-material-card-border-color: $base-border-color !default;
413413
$cardview-material-card-divider-color: $cardview-material-card-border-color !default;
414414
$cardview-material-card-text-color: $cardview-material-common-text-color !default;
@@ -492,7 +492,7 @@ $cardview-material-columnchooser--empty__message-color: null !default;
492492
$cardview-material-common-text-color: $base-text-color !default;
493493

494494
// Card
495-
$cardview-material-card-bg-color: $cardview-material-common-bg-color !default;
495+
$cardview-material-card-bg-color: $base-bg !default;
496496
$cardview-material-card-border-color: $base-border-color !default;
497497
$cardview-material-card-divider-color: $cardview-material-card-border-color !default;
498498
$cardview-material-card-text-color: $cardview-material-common-text-color !default;

packages/devextreme-scss/scss/widgets/material/cardView/_sizes.scss

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,13 @@ $cardview-material-common-border-radius: null !default;
2929
$cardview-material-common-text-weight: null !default;
3030

3131
/**
32-
* $name 105. Gap between header items
33-
* $type text
34-
*/
35-
$cardview-material-common-header-panel-gap: null !default;
36-
37-
/**
38-
* $name 106. Vertical gap between cards
32+
* $name 105. Vertical gap between cards
3933
* $type text
4034
*/
4135
$cardview-material-common-cards-row-gap: null !default;
4236

4337
/**
44-
* $name 107. Horizontal gap between cards
38+
* $name 106. Horizontal gap between cards
4539
* $type text
4640
*/
4741
$cardview-material-common-cards-column-gap: null !default;
@@ -277,7 +271,6 @@ $cardview-material-column-chooser__select-all-item-horizontal-padding: null !def
277271
// Common
278272
$cardview-material-common-border-radius: 16px !default;
279273
$cardview-material-common-text-weight: 400 !default;
280-
$cardview-material-common-header-panel-gap: 8px !default;
281274
$cardview-material-common-cards-row-gap: 16px !default;
282275
$cardview-material-common-cards-column-gap: 16px !default;
283276
$cardview-material-common-gap: 24px !default;
@@ -364,7 +357,6 @@ $cardview-material-column-chooser__select-all-item-horizontal-padding: null !def
364357
// Common
365358
$cardview-material-common-border-radius: 16px !default;
366359
$cardview-material-common-text-weight: 400 !default;
367-
$cardview-material-common-header-panel-gap: 4px !default;
368360
$cardview-material-common-cards-row-gap: 12px !default;
369361
$cardview-material-common-cards-column-gap: 12px !default;
370362
$cardview-material-common-gap: 16px !default;

0 commit comments

Comments
 (0)