Skip to content

Commit e8de02b

Browse files
authored
fix: update base styles user colors to work in Safari 17 (#10361)
1 parent 686150f commit e8de02b

File tree

29 files changed

+23
-11
lines changed

29 files changed

+23
-11
lines changed
-116 Bytes
Loading
626 Bytes
Loading
-837 Bytes
Loading
-698 Bytes
Loading

packages/component-base/src/styles/user-colors.js

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,48 @@ addGlobalThemeStyles(
1212
@layer vaadin.base {
1313
:where(html) {
1414
--_color-count: 10;
15-
--_hue-step: calc(360 / var(--_color-count) - 1);
16-
--vaadin-user-color-0: var(--vaadin-user-color, #4172d5);
15+
--_hue-step: round(360 / var(--_color-count), 1);
16+
--vaadin-user-color-0: var(--vaadin-user-color, oklch(0.52 0.2 240));
1717
--vaadin-user-color-1: oklch(
18-
from var(--vaadin-user-color-0) max(0.2, l - 0.1) c calc(h - var(--_hue-step) * 1)
18+
from var(--vaadin-user-color-0) calc(0.62 + clamp(-0.15, (0.6201 - l) * 10000, 0.15)) c
19+
calc(h - var(--_hue-step) * 2 * var(---_vaadin-safari-17-deg, 1))
1920
);
2021
--vaadin-user-color-2: oklch(
21-
from var(--vaadin-user-color-0) min(l + 0.1, 0.8) c calc(h - var(--_hue-step) * 2)
22+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * -2 * var(---_vaadin-safari-17-deg, 1))
2223
);
2324
--vaadin-user-color-3: oklch(
24-
from var(--vaadin-user-color-0) max(0.2, l - 0.1) c calc(h - var(--_hue-step) * 3)
25+
from var(--vaadin-user-color-0) calc(0.62 + clamp(-0.15, (0.6201 - l) * 10000, 0.15)) c
26+
calc(h - var(--_hue-step) * 0 * var(---_vaadin-safari-17-deg, 1))
2527
);
2628
--vaadin-user-color-4: oklch(
27-
from var(--vaadin-user-color-0) min(l + 0.1, 0.8) c calc(h - var(--_hue-step) * 4)
29+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * 2 * var(---_vaadin-safari-17-deg, 1))
2830
);
2931
--vaadin-user-color-5: oklch(
30-
from var(--vaadin-user-color-0) max(0.2, l - 0.1) c calc(h - var(--_hue-step) * 5)
32+
from var(--vaadin-user-color-0) calc(0.62 + clamp(-0.15, (0.6201 - l) * 10000, 0.15)) c
33+
calc(h - var(--_hue-step) * -2 * var(---_vaadin-safari-17-deg, 1))
3134
);
3235
--vaadin-user-color-6: oklch(
33-
from var(--vaadin-user-color-0) min(l + 0.1, 0.8) c calc(h - var(--_hue-step) * 6)
36+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * -4 * var(---_vaadin-safari-17-deg, 1))
3437
);
3538
--vaadin-user-color-7: oklch(
36-
from var(--vaadin-user-color-0) max(0.2, l - 0.1) c calc(h - var(--_hue-step) * 7)
39+
from var(--vaadin-user-color-0) calc(0.62 + clamp(-0.15, (0.6201 - l) * 10000, 0.15)) c
40+
calc(h - var(--_hue-step) * 4 * var(---_vaadin-safari-17-deg, 1))
3741
);
3842
--vaadin-user-color-8: oklch(
39-
from var(--vaadin-user-color-0) min(l + 0.1, 0.8) c calc(h - var(--_hue-step) * 8)
43+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * 4 * var(---_vaadin-safari-17-deg, 1))
4044
);
4145
--vaadin-user-color-9: oklch(
42-
from var(--vaadin-user-color-0) max(0.2, l - 0.1) c calc(h - var(--_hue-step) * 9)
46+
from var(--vaadin-user-color-0) calc(0.62 + clamp(-0.15, (0.6201 - l) * 10000, 0.15)) c
47+
calc(h - var(--_hue-step) * 6 * var(---_vaadin-safari-17-deg, 1))
4348
);
4449
}
50+
51+
@supports not (color: hsl(0 0 0)) {
52+
:where(:root),
53+
:where(:host) {
54+
---_vaadin-safari-17-deg: 1deg;
55+
}
56+
}
4557
}
4658
`,
4759
);
-18 Bytes
Loading
-10 Bytes
Loading
-5 Bytes
Loading
-20 Bytes
Loading
-48 Bytes
Loading

0 commit comments

Comments
 (0)