Skip to content

Commit 5a0d587

Browse files
vaadin-botjouni
andauthored
refactor: improve Aura surface and text colors (#10640) (#10645)
Co-authored-by: Jouni Koivuviita <jouni@vaadin.com>
1 parent eccb6a8 commit 5a0d587

File tree

2 files changed

+28
-33
lines changed

2 files changed

+28
-33
lines changed

packages/aura/src/color.css

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,22 @@ vaadin-tab,
7777
.aura-accent-purple
7878
) {
7979
--aura-neutral-light: oklch(
80-
from var(--aura-background-color-light) calc(0.2 - 0.05 * var(--aura-contrast-level)) calc(c * 0.1) h
80+
from var(--aura-background-color-light) calc(0.2 - 0.05 * var(--aura-contrast-level)) calc(c * l * 0.8) h
8181
);
8282
--aura-neutral-dark: oklch(
8383
from var(--aura-background-color-dark) calc(0.9 + 0.1 * var(--aura-contrast-level)) calc(c * l) h
8484
);
8585
--vaadin-text-color: light-dark(var(--aura-neutral-light), var(--aura-neutral-dark));
86-
--vaadin-text-color-secondary: light-dark(
87-
oklch(
88-
from var(--aura-background-color-light) calc(l * 0.55 - 0.05 * var(--aura-contrast-level) + c / 2) calc(c * 0.6) h
89-
),
90-
oklch(
91-
from var(--aura-background-color-dark) calc(0.6 + l / 4 + 0.05 * var(--aura-contrast-level)) calc(c * l * 3) h
92-
)
86+
--vaadin-text-color-secondary: color-mix(
87+
in oklch,
88+
var(--vaadin-text-color) min(95%, 60% + 5% * var(--aura-contrast-level)),
89+
transparent
9390
);
94-
--vaadin-text-color-disabled: light-dark(
95-
oklch(from var(--aura-background-color-light) calc(l * 0.75 - 0.03 * var(--aura-contrast-level)) calc(c * 0.8) h),
96-
oklch(from var(--aura-background-color-dark) calc(0.45 + 0.03 * var(--aura-contrast-level)) calc(c * 0.8) h)
91+
--vaadin-text-color-disabled: color-mix(
92+
in oklch,
93+
var(--vaadin-text-color) min(95%, 30% + 3% * var(--aura-contrast-level)),
94+
transparent
9795
);
98-
9996
--_border-color-base: light-dark(
10097
oklch(from var(--aura-background-color-light) 0.1 c h),
10198
oklch(from var(--aura-background-color-dark) calc(0.8 + max(0, 0.2 - l) + c / 2) calc(c - l / 4) h)
@@ -119,36 +116,35 @@ vaadin-tab,
119116
from var(--aura-accent-color-light) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c) calc(c * 0.9) h
120117
);
121118
--aura-accent-text-color-dark: oklch(
122-
from var(--aura-accent-color-dark) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c) calc(c * 0.9) h
119+
from var(--aura-accent-color-dark) max(0.8, 0.9 + 0.1 * var(--aura-contrast-level) - c * 2) calc(c * 0.9) h
123120
);
124121
--aura-accent-color: light-dark(var(--aura-accent-color-light), var(--aura-accent-color-dark));
125122
--aura-accent-contrast-color: light-dark(
126123
var(--aura-accent-contrast-color-light),
127124
var(--aura-accent-contrast-color-dark)
128125
);
129126
--aura-accent-text-color: light-dark(var(--aura-accent-text-color-light), var(--aura-accent-text-color-dark));
130-
--_accent-blend-light: oklch(
131-
from var(--aura-accent-color-light) calc(l) c h / min(0.1, c * var(--aura-surface-opacity))
127+
--_accent-surface-light: color-mix(
128+
in srgb,
129+
oklch(from var(--aura-accent-color-light) l c h / min(1, c + (1 - l) / 20))
130+
calc((60% - 6% * abs(var(--aura-surface-level))) * var(--aura-surface-opacity)),
131+
var(--aura-surface-color-solid) calc((25% + 20% * abs(var(--aura-surface-level))) * var(--aura-surface-opacity))
132132
);
133-
--_accent-blend-dark: oklch(
134-
from var(--aura-accent-color-dark) calc(l) c h / min(0.1, c * var(--aura-surface-opacity))
133+
--_accent-surface-dark: color-mix(
134+
in srgb,
135+
oklch(from var(--aura-accent-color-dark) l c h / min(1, c + (1 - l) / 10))
136+
calc((60% - 6% * abs(var(--aura-surface-level))) * var(--aura-surface-opacity)),
137+
var(--aura-surface-color-solid) calc((40% + 6% * abs(var(--aura-surface-level))) * var(--aura-surface-opacity))
135138
);
136-
--aura-accent-surface: light-dark(
137-
color-mix(
138-
in srgb,
139-
var(--_accent-blend-light),
140-
var(--aura-surface-color-solid) calc(var(--aura-surface-opacity) * 100%)
141-
),
142-
color-mix(
143-
in srgb,
144-
var(--_accent-blend-dark),
145-
var(--aura-surface-color-solid) calc(var(--aura-surface-opacity) * 50%)
146-
)
139+
--aura-accent-surface: light-dark(var(--_accent-surface-light), var(--_accent-surface-dark));
140+
--_accent-border: light-dark(
141+
oklch(from var(--aura-accent-color-light) 0.8 calc(c * 1.1) h / min(1, c + (1 - l) / 10)),
142+
oklch(from var(--aura-accent-color-dark) 0.8 calc(c * 1.1) h / min(1, c + (1 - l) / 10))
147143
);
148144
--aura-accent-border-color: color-mix(
149145
in srgb,
150-
var(--aura-accent-text-color) calc(14% + 2% * var(--aura-contrast-level)),
151-
var(--vaadin-border-color) calc(28% + 2% * var(--aura-contrast-level))
146+
var(--_accent-border) calc(30% - 1% * var(--aura-surface-level) + 1% * var(--aura-contrast-level)),
147+
var(--vaadin-border-color) 60%
152148
);
153149
--_color-base: light-dark(
154150
oklch(from var(--aura-background-color-light) 0.1 calc(c / 2 + c * (1 - c)) h),

packages/aura/src/surface.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ vaadin-crud-dialog::part(overlay) {
3636

3737
--aura-surface-color-solid: light-dark(
3838
oklch(
39-
from var(--aura-background-color-light)
40-
min(1, l + ((1 - l) / 4 + 0.06 - var(--aura-surface-opacity) / 20) * var(--aura-surface-level))
41-
clamp(0, c - l / 10 * var(--aura-surface-level) + var(--aura-surface-opacity) / 40, c) h
39+
from var(--aura-background-color-light) min(1, l + ((1 - l) / 2 + 0.04) * var(--aura-surface-level))
40+
clamp(0, c - (c / 3 + (l / 1000)) * var(--aura-surface-level), c) h
4241
),
4342
oklch(
4443
from var(--aura-background-color-dark)

0 commit comments

Comments
 (0)