Skip to content

Commit ebe8961

Browse files
authored
refactor!: rename aura-contrast to aura-contrast-level (#10556)
1 parent 94f0527 commit ebe8961

File tree

4 files changed

+36
-32
lines changed

4 files changed

+36
-32
lines changed

dev/aura.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ <h3>Edit Theme</h3>
478478
property="--aura-background-color-dark"
479479
label="--aura-background-color-dark"
480480
></aura-color-control>
481-
<aura-number-control property="--aura-contrast" min="0" max="2" step="0.1"></aura-number-control>
481+
<aura-number-control property="--aura-contrast-level" min="0" max="2" step="0.1"></aura-number-control>
482482
<aura-number-control property="--aura-surface-level" min="-2" max="2" step="0.1"></aura-number-control>
483483
<aura-number-control
484484
property="--aura-overlay-surface-opacity"

packages/aura/src/color.css

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:where(:root),
22
:where(:host) {
3-
--aura-contrast: 1;
3+
--aura-contrast-level: 1;
44

55
--aura-accent-color-light: var(--aura-text-color-light);
66
--aura-accent-color-dark: var(--aura-text-color-dark);
@@ -72,19 +72,23 @@ vaadin-tab,
7272
.aura-accent-purple
7373
) {
7474
--aura-text-color-light: oklch(
75-
from var(--aura-background-color-light) calc(0.2 - 0.05 * var(--aura-contrast)) calc(c * 0.1) h
75+
from var(--aura-background-color-light) calc(0.2 - 0.05 * var(--aura-contrast-level)) calc(c * 0.1) h
7676
);
7777
--aura-text-color-dark: oklch(
78-
from var(--aura-background-color-dark) calc(0.9 + 0.1 * var(--aura-contrast)) calc(c * l) h
78+
from var(--aura-background-color-dark) calc(0.9 + 0.1 * var(--aura-contrast-level)) calc(c * l) h
7979
);
8080
--vaadin-text-color: light-dark(var(--aura-text-color-light), var(--aura-text-color-dark));
8181
--vaadin-text-color-secondary: light-dark(
82-
oklch(from var(--aura-background-color-light) calc(l * 0.55 - 0.05 * var(--aura-contrast) + c / 2) calc(c * 0.6) h),
83-
oklch(from var(--aura-background-color-dark) calc(0.6 + l / 4 + 0.05 * var(--aura-contrast)) calc(c * l * 3) h)
82+
oklch(
83+
from var(--aura-background-color-light) calc(l * 0.55 - 0.05 * var(--aura-contrast-level) + c / 2) calc(c * 0.6) h
84+
),
85+
oklch(
86+
from var(--aura-background-color-dark) calc(0.6 + l / 4 + 0.05 * var(--aura-contrast-level)) calc(c * l * 3) h
87+
)
8488
);
8589
--vaadin-text-color-disabled: light-dark(
86-
oklch(from var(--aura-background-color-light) calc(l * 0.75 - 0.03 * var(--aura-contrast)) calc(c * 0.8) h),
87-
oklch(from var(--aura-background-color-dark) calc(0.45 + 0.03 * var(--aura-contrast)) calc(c * 0.8) h)
90+
oklch(from var(--aura-background-color-light) calc(l * 0.75 - 0.03 * var(--aura-contrast-level)) calc(c * 0.8) h),
91+
oklch(from var(--aura-background-color-dark) calc(0.45 + 0.03 * var(--aura-contrast-level)) calc(c * 0.8) h)
8892
);
8993

9094
--_border-color-base: light-dark(
@@ -93,12 +97,12 @@ vaadin-tab,
9397
);
9498
--vaadin-border-color: color-mix(
9599
in srgb,
96-
var(--_border-color-base) calc(14% + 6% * var(--aura-contrast)),
100+
var(--_border-color-base) calc(14% + 6% * var(--aura-contrast-level)),
97101
transparent
98102
);
99103
--vaadin-border-color-secondary: light-dark(
100-
color-mix(in srgb, var(--_border-color-base) max(6%, 5% + 3% * var(--aura-contrast)), transparent),
101-
color-mix(in srgb, var(--_border-color-base) max(8%, 7% + 3% * var(--aura-contrast)), transparent)
104+
color-mix(in srgb, var(--_border-color-base) max(6%, 5% + 3% * var(--aura-contrast-level)), transparent),
105+
color-mix(in srgb, var(--_border-color-base) max(8%, 7% + 3% * var(--aura-contrast-level)), transparent)
102106
);
103107
--aura-accent-contrast-color-light: oklch(
104108
from var(--aura-accent-color-light) clamp(0, (0.62 - l) * 1000, 1) 0 0 / clamp(0.8, (0.62 - l) * 1000, 1)
@@ -107,10 +111,10 @@ vaadin-tab,
107111
from var(--aura-accent-color-dark) clamp(0, (0.62 - l) * 1000, 1) 0 0 / clamp(0.8, (0.62 - l) * 1000, 1)
108112
);
109113
--aura-accent-text-color-light: oklch(
110-
from var(--aura-accent-color-light) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c) calc(c * 0.9) h
114+
from var(--aura-accent-color-light) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c) calc(c * 0.9) h
111115
);
112116
--aura-accent-text-color-dark: oklch(
113-
from var(--aura-accent-color-dark) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c) calc(c * 0.9) h
117+
from var(--aura-accent-color-dark) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c) calc(c * 0.9) h
114118
);
115119
--aura-accent-color: light-dark(var(--aura-accent-color-light), var(--aura-accent-color-dark));
116120
--aura-accent-contrast-color: light-dark(
@@ -138,8 +142,8 @@ vaadin-tab,
138142
);
139143
--aura-accent-border-color: color-mix(
140144
in srgb,
141-
var(--aura-accent-text-color) calc(14% + 2% * var(--aura-contrast)),
142-
var(--vaadin-border-color) calc(28% + 2% * var(--aura-contrast))
145+
var(--aura-accent-text-color) calc(14% + 2% * var(--aura-contrast-level)),
146+
var(--vaadin-border-color) calc(28% + 2% * var(--aura-contrast-level))
143147
);
144148
--_color-base: light-dark(
145149
oklch(from var(--aura-background-color-light) 0.1 calc(c / 2 + c * (1 - c)) h),
@@ -148,12 +152,12 @@ vaadin-tab,
148152
--aura-background-color: light-dark(var(--aura-background-color-light), var(--aura-background-color-dark));
149153
--vaadin-background-container: color-mix(
150154
in srgb,
151-
var(--_color-base) calc(3% + min(3%, 1% * var(--aura-contrast))),
155+
var(--_color-base) calc(3% + min(3%, 1% * var(--aura-contrast-level))),
152156
transparent
153157
);
154158
--vaadin-background-container-strong: color-mix(
155159
in srgb,
156-
var(--_color-base) calc(7% + min(8%, 1.5% * var(--aura-contrast))),
160+
var(--_color-base) calc(7% + min(8%, 1.5% * var(--aura-contrast-level))),
157161
transparent
158162
);
159163
accent-color: var(--aura-accent-color);

packages/aura/src/components/overlay.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
hsla(0deg, 0%, 0%, 0.3)
77
);
88
--aura-overlay-outline-color: light-dark(
9-
oklch(from var(--aura-background-color-light) 0.1 c h / max(0.04, 0.03 + 0.04 * var(--aura-contrast))),
10-
oklch(from var(--aura-background-color-dark) 0.1 c h / max(0.04, 0.03 + 0.04 * var(--aura-contrast)))
9+
oklch(from var(--aura-background-color-light) 0.1 c h / max(0.04, 0.03 + 0.04 * var(--aura-contrast-level))),
10+
oklch(from var(--aura-background-color-dark) 0.1 c h / max(0.04, 0.03 + 0.04 * var(--aura-contrast-level)))
1111
);
12-
--aura-overlay-inner-outline-color: hsla(0deg, 0%, 100%, max(3%, 2% + 4% * var(--aura-contrast)));
12+
--aura-overlay-inner-outline-color: hsla(0deg, 0%, 100%, max(3%, 2% + 4% * var(--aura-contrast-level)));
1313
--aura-overlay-shadow:
1414
inset 0 0 0 1px var(--aura-overlay-inner-outline-color), 0 0 0 1px var(--aura-overlay-outline-color),
1515
var(--aura-shadow-m);

packages/aura/src/palette.css

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,27 +8,27 @@
88
--aura-purple: oklch(0.58 0.22 290);
99

1010
--aura-red-text: light-dark(
11-
oklch(from var(--aura-red) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c * 0.75) calc(c * 0.9) h),
12-
oklch(from var(--aura-red) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c * 0.75) calc(c * 0.9) h)
11+
oklch(from var(--aura-red) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c * 0.75) calc(c * 0.9) h),
12+
oklch(from var(--aura-red) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c * 0.75) calc(c * 0.9) h)
1313
);
1414
--aura-orange-text: light-dark(
15-
oklch(from var(--aura-orange) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c * 0.75) calc(c * 0.9) h),
16-
oklch(from var(--aura-orange) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c * 0.75) calc(c * 0.9) h)
15+
oklch(from var(--aura-orange) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c * 0.75) calc(c * 0.9) h),
16+
oklch(from var(--aura-orange) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c * 0.75) calc(c * 0.9) h)
1717
);
1818
--aura-yellow-text: light-dark(
19-
oklch(from var(--aura-yellow) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c * 0.75) calc(c * 0.9) h),
20-
oklch(from var(--aura-yellow) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c * 0.75) calc(c * 0.9) h)
19+
oklch(from var(--aura-yellow) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c * 0.75) calc(c * 0.9) h),
20+
oklch(from var(--aura-yellow) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c * 0.75) calc(c * 0.9) h)
2121
);
2222
--aura-green-text: light-dark(
23-
oklch(from var(--aura-green) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c * 0.75) calc(c * 0.9) h),
24-
oklch(from var(--aura-green) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c * 0.75) calc(c * 0.9) h)
23+
oklch(from var(--aura-green) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c * 0.75) calc(c * 0.9) h),
24+
oklch(from var(--aura-green) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c * 0.75) calc(c * 0.9) h)
2525
);
2626
--aura-blue-text: light-dark(
27-
oklch(from var(--aura-blue) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c * 0.75) calc(c * 0.9) h),
28-
oklch(from var(--aura-blue) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c * 0.75) calc(c * 0.9) h)
27+
oklch(from var(--aura-blue) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c * 0.75) calc(c * 0.9) h),
28+
oklch(from var(--aura-blue) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c * 0.75) calc(c * 0.9) h)
2929
);
3030
--aura-purple-text: light-dark(
31-
oklch(from var(--aura-purple) min(0.55, 0.35 - 0.05 * var(--aura-contrast) + c * 0.75) calc(c * 0.9) h),
32-
oklch(from var(--aura-purple) max(0.8, 0.9 + 0.05 * var(--aura-contrast) - c * 0.75) calc(c * 0.9) h)
31+
oklch(from var(--aura-purple) min(0.55, 0.35 - 0.05 * var(--aura-contrast-level) + c * 0.75) calc(c * 0.9) h),
32+
oklch(from var(--aura-purple) max(0.8, 0.9 + 0.05 * var(--aura-contrast-level) - c * 0.75) calc(c * 0.9) h)
3333
);
3434
}

0 commit comments

Comments
 (0)