Skip to content

Commit bf304c4

Browse files
jouniDiegoCardoso
andauthored
refactor: enable base style custom property overrides (#11123)
* refactor: enable base style custom property overrides * test: update dashboard baseline screenshots for aura * test: update dashboard baseline screenshots for aura dark --------- Co-authored-by: Diego Cardoso <diego@vaadin.com>
1 parent 98c5861 commit bf304c4

28 files changed

+13
-25
lines changed

packages/aura/src/components/app-layout.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ vaadin-app-layout {
2525
}
2626

2727
vaadin-app-layout[overlay]::part(drawer) {
28-
--vaadin-app-layout-drawer-background: var(--aura-surface-color);
28+
background: var(--vaadin-app-layout-drawer-background, var(--aura-surface-color));
2929
--aura-surface-opacity: var(--aura-overlay-surface-opacity);
3030
-webkit-backdrop-filter: var(--aura-overlay-backdrop-filter);
3131
backdrop-filter: var(--aura-overlay-backdrop-filter);
@@ -37,7 +37,7 @@ vaadin-app-layout:not([has-drawer]) {
3737
}
3838

3939
vaadin-app-layout::part(navbar) {
40-
--vaadin-app-layout-navbar-background: transparent;
40+
background: var(--vaadin-app-layout-navbar-background, transparent);
4141
-webkit-backdrop-filter: blur(20px);
4242
backdrop-filter: blur(20px);
4343
}
@@ -52,7 +52,6 @@ vaadin-app-layout[has-navbar]::part(drawer) {
5252
}
5353

5454
vaadin-app-layout > vaadin-scroller[slot='drawer'] {
55-
/* TODO would need a dedicated padding-top property */
5655
--vaadin-scroller-padding-inline: var(--vaadin-padding-m);
5756
--vaadin-scroller-padding-block: var(--vaadin-padding-s);
5857
scrollbar-width: thin;

packages/aura/src/components/avatar.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ vaadin-avatar:where([has-color-index]) {
2020
--aura-accent-color-light: var(--vaadin-avatar-user-color);
2121
--aura-accent-color-dark: var(--vaadin-avatar-user-color);
2222
--aura-accent-color: light-dark(var(--aura-accent-color-light), var(--aura-accent-color-dark));
23-
color: var(--vaadin-avatar-text-color, var(--aura-accent-text-color));
24-
--vaadin-avatar-background: var(--vaadin-accent-surface);
25-
--vaadin-avatar-text-color: var(--aura-accent-text-color);
2623
--vaadin-avatar-border-color: var(--aura-accent-border-color);
2724
--vaadin-avatar-border-width: 1px;
2825
}

packages/aura/src/components/button.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
transition: scale 180ms;
88
position: relative;
99
--_background: var(--aura-accent-surface) padding-box;
10-
--vaadin-button-text-color: var(--aura-accent-text-color);
10+
color: var(--vaadin-button-text-color, var(--aura-accent-text-color));
1111
}
1212

1313
vaadin-drawer-toggle[theme~='tertiary']::part(icon) {
@@ -25,7 +25,7 @@ vaadin-drawer-toggle[theme~='tertiary']::part(icon) {
2525
/* prettier-ignore */
2626
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):not([theme~='primary'], [theme~='tertiary']) {
2727
background: var(--vaadin-button-background, var(--_background));
28-
--vaadin-button-border-color: var(--aura-accent-border-color);
28+
border-color: var(--vaadin-button-border-color, var(--aura-accent-border-color));
2929
}
3030

3131
:is(vaadin-button, vaadin-upload-button, vaadin-menu-bar-button, vaadin-drawer-toggle, vaadin-crud-edit):where(

packages/aura/src/components/dashboard.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ vaadin-dashboard-widget {
4040
}
4141

4242
&[editable] {
43-
--vaadin-dashboard-widget-shadow: var(--aura-shadow-s);
43+
box-shadow: var(--vaadin-dashboard-widget-shadow, var(--aura-shadow-s));
4444
}
4545
}
4646

packages/aura/src/components/date-picker.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
:where(:host) {
33
--vaadin-date-picker-year-scroller-background: light-dark(var(--vaadin-background-container), transparent);
44
--vaadin-date-picker-month-header-font-weight: var(--aura-font-weight-semibold);
5-
/* TODO add/use selection color */
65
--vaadin-date-picker-date-selected-background: var(--aura-accent-color);
76
--vaadin-date-picker-date-selected-color: var(--aura-accent-contrast-color);
87
}

packages/aura/src/components/dialog.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ vaadin-confirm-dialog {
1111

1212
vaadin-dialog::part(overlay),
1313
vaadin-confirm-dialog::part(overlay) {
14-
--vaadin-dialog-background: var(--aura-surface-color);
14+
background: var(--vaadin-dialog-background, var(--vaadin-overlay-background, var(--aura-surface-color)));
1515
--aura-surface-level: 4;
1616

1717
/* TODO probably should be in base styles */

packages/aura/src/components/grid.css

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,6 @@
1111
justify-content: center;
1212
}
1313

14-
/* TODO custom part name: how should we indicate an active row? Should we have a built-in part name? */
15-
vaadin-grid::part(active-nav-item) {
16-
--vaadin-grid-row-highlight-background-color: var(--vaadin-background-container);
17-
}
18-
1914
vaadin-grid-sorter::part(indicators) {
2015
transition: color 120ms;
2116
}

packages/aura/src/components/item-overlay.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
var(--aura-item-overlay-padding-inline) * 100,
99
var(--vaadin-radius-m) - min(var(--aura-item-overlay-padding-inline), var(--aura-item-overlay-padding-block))
1010
);
11-
--vaadin-item-checkmark-color: var(--aura-accent-text-color);
1211
--vaadin-item-gap: var(--vaadin-gap-s);
1312
}
1413

@@ -21,7 +20,6 @@ vaadin-menu-bar-item,
2120
vaadin-multi-select-combo-box-item,
2221
vaadin-select-item:where([role]) {
2322
font-weight: var(--aura-font-weight-medium);
24-
--vaadin-item-checkmark-color: var(--aura-accent-text-color);
2523
-webkit-user-select: none;
2624
user-select: none;
2725
--_highlight-color: light-dark(
@@ -32,6 +30,7 @@ vaadin-select-item:where([role]) {
3230
gap: 0;
3331

3432
&::part(checkmark) {
33+
color: var(--vaadin-item-checkmark-color, var(--aura-accent-text-color));
3534
--vaadin-icon-visual-size: 75%;
3635
}
3736

packages/aura/src/components/multi-select-combo-box.css

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
:where(:host) {
33
--vaadin-chip-padding: 0.4em;
44
--vaadin-chip-background: var(--vaadin-background-container-strong);
5+
--vaadin-chip-height: 1lh;
6+
--vaadin-chip-border-radius: var(--vaadin-radius-s);
7+
--vaadin-chip-border-width: 0px;
58
}
69

710
vaadin-multi-select-combo-box-chip {
8-
--vaadin-chip-height: 1lh;
911
--vaadin-icon-size: 1.25em;
10-
--vaadin-chip-padding: 0.4em;
11-
--vaadin-chip-border-radius: var(--vaadin-radius-s);
12-
--vaadin-chip-border-width: 0px;
1312
}

packages/aura/src/components/overlay.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
}
2727

2828
::part(overlay) {
29-
--vaadin-overlay-background: var(--aura-surface-color);
29+
background: var(--vaadin-overlay-background, var(--aura-surface-color));
3030
--aura-surface-level: 4;
3131
--aura-surface-opacity: var(--aura-overlay-surface-opacity);
3232
box-shadow: var(--aura-overlay-outline-shadow), var(--vaadin-overlay-shadow, var(--aura-overlay-shadow));

0 commit comments

Comments
 (0)