Skip to content

Commit 1550113

Browse files
authored
refactor: rename base styles custom CSS properties for colors (#10189)
1 parent 6cb17a9 commit 1550113

File tree

72 files changed

+217
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+217
-188
lines changed

dev/app-layout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
div[slot~='navbar'] {
2121
font-size: 1.125rem;
2222
margin: 0;
23-
color: var(--vaadin-color);
23+
color: var(--vaadin-text-color);
2424
font-weight: 600;
2525
}
2626

dev/aura.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@
244244
place-self: stretch;
245245
margin: var(--vaadin-gap-m) 0;
246246
border: 0;
247-
background: var(--vaadin-border-color-subtle);
247+
background: var(--vaadin-border-color-secondary);
248248
min-height: 1px;
249249
max-height: 1px;
250250
}
@@ -402,7 +402,7 @@ <h1>Components</h1>
402402
align-items: center;
403403
justify-content: center;
404404
border-radius: var(--vaadin-radius-m);
405-
border: 1px solid var(--vaadin-border-color-subtle);
405+
border: 1px solid var(--vaadin-border-color-secondary);
406406
gap: var(--vaadin-gap-s);
407407
padding: var(--vaadin-padding-l);
408408
box-sizing: border-box;
@@ -477,7 +477,6 @@ <h1>Components</h1>
477477
</div>
478478

479479
<div class="aura-surface component wide tall">
480-
481480
<div class="badges">
482481
<span theme="badge">Default</span>
483482
<span theme="badge accent">Accent</span>

dev/aura/aura-abstract-control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export class AuraControl extends HTMLElement {
1515
}
1616
1717
label {
18-
color: var(--vaadin-color);
18+
color: var(--vaadin-text-color);
1919
font-weight: var(--aura-font-weight-medium);
2020
}
2121

dev/aura/aura-scheme-control.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AuraSchemeControl extends AuraControl {
4545
cursor: pointer;
4646
user-select: none;
4747
display: inline-block;
48-
border-right: 1px solid var(--vaadin-border-color-subtle);
48+
border-right: 1px solid var(--vaadin-border-color-secondary);
4949
}
5050
5151
.segmented label:last-of-type {
@@ -55,7 +55,7 @@ class AuraSchemeControl extends AuraControl {
5555
/* Selected state */
5656
.segmented input:checked + label {
5757
background: var(--vaadin-background-container);
58-
color: var(--vaadin-color);
58+
color: var(--vaadin-text-color);
5959
background-clip: padding-box;
6060
font-weight: 600;
6161
}

dev/aura/aura-view.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
font-size: var(--aura-font-size-l);
2727
font-weight: var(--aura-font-weight-semibold);
2828
line-height: var(--aura-line-height-m);
29-
color: var(--vaadin-color);
29+
color: var(--vaadin-text-color);
3030
flex: 1;
3131

3232
&:first-child {

dev/aura/badge.css

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
padding: 0 0.5em;
1313
border-radius: var(--vaadin-radius-l);
1414
min-width: calc(1lh - 1em - 2px);
15-
--color: var(--vaadin-color);
15+
--color: var(--vaadin-text-color);
1616
--text-opacity: 70%;
17-
color: color-mix(in xyz, var(--color) calc(var(--text-opacity) - 15% * var(--aura-contrast)), var(--vaadin-color));
17+
color: color-mix(
18+
in xyz,
19+
var(--color) calc(var(--text-opacity) - 15% * var(--aura-contrast)),
20+
var(--vaadin-text-color)
21+
);
1822
--vaadin-icon-size: 0.75lh;
1923
}
2024

packages/aura/src/color.css

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,19 @@
88
oklch(from var(--aura-background-light) 0.1 calc(c / 2 + c * (1 - c)) h),
99
oklch(from var(--aura-background-dark) 1 c h)
1010
);
11-
--vaadin-color: light-dark(
11+
--vaadin-text-color: light-dark(
1212
color-mix(in srgb, var(--_color-base) calc(90% + 5% * var(--aura-contrast)), transparent),
1313
color-mix(in srgb, #fff calc(90% + 5% * var(--aura-contrast)), transparent)
1414
);
15-
--vaadin-color-subtle: light-dark(
15+
--vaadin-text-color-secondary: light-dark(
1616
color-mix(in srgb, var(--_color-base) calc(55% + 10% * var(--aura-contrast)), transparent),
1717
color-mix(in srgb, var(--_color-base) calc(57% + 10% * var(--aura-contrast)), transparent)
1818
);
19-
--vaadin-color-disabled: color-mix(in srgb, var(--_color-base) calc(30% + 10% * var(--aura-contrast)), transparent);
19+
--vaadin-text-color-disabled: color-mix(
20+
in srgb,
21+
var(--_color-base) calc(30% + 10% * var(--aura-contrast)),
22+
transparent
23+
);
2024

2125
--_border-color-base: light-dark(
2226
oklch(from var(--aura-background-light) 0.1 c h),
@@ -27,7 +31,7 @@
2731
var(--_border-color-base) calc(14% + 6% * var(--aura-contrast)),
2832
transparent
2933
);
30-
--vaadin-border-color-subtle: light-dark(
34+
--vaadin-border-color-secondary: light-dark(
3135
color-mix(in srgb, var(--_border-color-base) max(5%, 5% + 3% * var(--aura-contrast)), transparent),
3236
color-mix(in srgb, var(--_border-color-base) max(6%, 5% + 5% * var(--aura-contrast)), transparent)
3337
);
@@ -62,12 +66,12 @@
6266
--aura-accent-text-light: color-mix(
6367
in srgb,
6468
var(--aura-accent-light) calc(70% - 15% * var(--aura-contrast)),
65-
var(--vaadin-color)
69+
var(--vaadin-text-color)
6670
);
6771
--aura-accent-text-dark: color-mix(
6872
in srgb,
6973
var(--aura-accent-dark) calc(70% - 15% * var(--aura-contrast)),
70-
var(--vaadin-color)
74+
var(--vaadin-text-color)
7175
);
7276
--aura-accent-text: light-dark(var(--aura-accent-text-light), var(--aura-accent-text-dark));
7377

@@ -86,7 +90,7 @@
8690
transparent
8791
);
8892

89-
color: var(--vaadin-color);
93+
color: var(--vaadin-text-color);
9094
background: var(--aura-app-background);
9195
background-size: 100vw 100vh;
9296
background-attachment: fixed;
@@ -99,5 +103,5 @@
99103
}
100104

101105
:where(h1, h2, h3, h4, h5, h6) {
102-
color: var(--vaadin-color);
106+
color: var(--vaadin-text-color);
103107
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ vaadin-app-layout > vaadin-scroller:nth-last-child(1 of [slot='drawer']) {
7676

7777
vaadin-app-layout > :nth-child(1 of :not([slot])):nth-last-child(1 of :not([slot])) {
7878
color-scheme: var(--aura-content-color-scheme);
79-
color: var(--vaadin-color);
79+
color: var(--vaadin-text-color);
8080
background: linear-gradient(var(--aura-surface), var(--aura-surface)), var(--aura-app-background);
8181
background-clip: padding-box;
8282
background-origin: border-box;
8383
min-height: 100%;
8484
box-sizing: border-box;
8585
border-radius: var(--_app-layout-radius);
86-
border: var(--_aura-mdl-border) solid var(--vaadin-border-color-subtle);
86+
border: var(--_aura-mdl-border) solid var(--vaadin-border-color-secondary);
8787
border-block-width: min(var(--aura-app-layout-inset), var(--_aura-mdl-border));
8888
border-inline-end-width: min(var(--aura-app-layout-inset), var(--_aura-mdl-border));
8989
}
@@ -100,7 +100,7 @@ vaadin-app-layout > vaadin-master-detail-layout:nth-child(1 of :not([slot])):nth
100100
}
101101

102102
&:is([drawer][has-detail]) {
103-
border-color: light-dark(var(--vaadin-border-color), var(--vaadin-border-color-subtle));
103+
border-color: light-dark(var(--vaadin-border-color), var(--vaadin-border-color-secondary));
104104
}
105105
}
106106

packages/aura/src/components/avatar.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
:where(:root, :host) {
2-
--vaadin-avatar-border-color: var(--vaadin-border-color-subtle);
2+
--vaadin-avatar-border-color: var(--vaadin-border-color-secondary);
33
--vaadin-avatar-background: var(--vaadin-background-container);
44
--vaadin-avatar-font-weight: var(--aura-font-weight-medium);
55
--vaadin-avatar-font-size: var(--aura-font-size-m);

packages/aura/src/components/button.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ vaadin-menu-bar-button[aria-haspopup='true'] {
5555
}
5656

5757
:is(vaadin-button, vaadin-menu-bar-button, vaadin-drawer-toggle)[disabled][theme~='primary'] {
58-
--vaadin-button-text-color: var(--vaadin-color-subtle);
58+
--vaadin-button-text-color: var(--vaadin-text-color-secondary);
5959
}
6060

6161
:is(vaadin-button, vaadin-menu-bar-button, vaadin-drawer-toggle):not([disabled])::before {

0 commit comments

Comments
 (0)