Skip to content

Commit f4c1fc6

Browse files
authored
refactor: rename and move safari 17 workaround custom property (#10514)
1 parent f3db815 commit f4c1fc6

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

packages/component-base/src/styles/style-props.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,12 @@ addGlobalThemeStyles(
120120
--safe-area-inset-left: env(safe-area-inset-left, 0px);
121121
}
122122
123+
@supports not (color: hsl(0 0 0)) {
124+
:where(html) {
125+
--_vaadin-safari-17-deg: 1deg;
126+
}
127+
}
128+
123129
@media (forced-colors: active) {
124130
html {
125131
--vaadin-background-color: Canvas;

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

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,44 +16,37 @@ addGlobalThemeStyles(
1616
--vaadin-user-color-0: var(--vaadin-user-color, oklch(0.52 0.2 240));
1717
--vaadin-user-color-1: oklch(
1818
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))
19+
calc(h - var(--_hue-step) * 2 * var(--_vaadin-safari-17-deg, 1))
2020
);
2121
--vaadin-user-color-2: oklch(
22-
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * -2 * var(---_vaadin-safari-17-deg, 1))
22+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * -2 * var(--_vaadin-safari-17-deg, 1))
2323
);
2424
--vaadin-user-color-3: oklch(
2525
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))
26+
calc(h - var(--_hue-step) * 0 * var(--_vaadin-safari-17-deg, 1))
2727
);
2828
--vaadin-user-color-4: oklch(
29-
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * 2 * var(---_vaadin-safari-17-deg, 1))
29+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * 2 * var(--_vaadin-safari-17-deg, 1))
3030
);
3131
--vaadin-user-color-5: oklch(
3232
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))
33+
calc(h - var(--_hue-step) * -2 * var(--_vaadin-safari-17-deg, 1))
3434
);
3535
--vaadin-user-color-6: oklch(
36-
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * -4 * var(---_vaadin-safari-17-deg, 1))
36+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * -4 * var(--_vaadin-safari-17-deg, 1))
3737
);
3838
--vaadin-user-color-7: oklch(
3939
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))
40+
calc(h - var(--_hue-step) * 4 * var(--_vaadin-safari-17-deg, 1))
4141
);
4242
--vaadin-user-color-8: oklch(
43-
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * 4 * var(---_vaadin-safari-17-deg, 1))
43+
from var(--vaadin-user-color-0) l c calc(h - var(--_hue-step) * 4 * var(--_vaadin-safari-17-deg, 1))
4444
);
4545
--vaadin-user-color-9: oklch(
4646
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))
47+
calc(h - var(--_hue-step) * 6 * var(--_vaadin-safari-17-deg, 1))
4848
);
4949
}
50-
51-
@supports not (color: hsl(0 0 0)) {
52-
:where(:root),
53-
:where(:host) {
54-
---_vaadin-safari-17-deg: 1deg;
55-
}
56-
}
5750
}
5851
`,
5952
);

0 commit comments

Comments
 (0)