Skip to content

deduplicate CSS tokens #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 25, 2024
Merged

deduplicate CSS tokens #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
068f689
deduplicate CSS tokens
Rich-Harris Sep 25, 2024
6e8fb14
ugh
Rich-Harris Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/svelte.dev/src/app.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@
}
</style>

%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<script>
const themeValue = JSON.parse(localStorage.getItem('svelte:theme'))?.current;
const systemPreferredTheme = window.matchMedia('(prefers-color-scheme: dark)').matches
? 'dark'
: 'light';

document.body.classList.remove('light', 'dark');
document.body.classList.add(themeValue ?? systemPreferredTheme);
document.documentElement.classList.remove('light', 'dark');
document.documentElement.classList.add(themeValue ?? systemPreferredTheme);
</script>

%sveltekit.head%
</head>
<body data-sveltekit-preload-data="hover">
<div style="height: 100%">%sveltekit.body%</div>

<script>
Expand Down
4 changes: 2 additions & 2 deletions packages/site-kit/src/lib/stores/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ export const theme = persisted<Theme>('svelte:theme', {
theme.subscribe(($theme) => {
if (!BROWSER) return;

document.body.classList.remove('light', 'dark');
document.body.classList.add($theme.current);
document.documentElement.classList.remove('light', 'dark');
document.documentElement.classList.add($theme.current);
});
193 changes: 49 additions & 144 deletions packages/site-kit/src/lib/styles/tokens.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
/*

!IMPORTANT: The tokens for light and dark mode are duplicated, if you change a token for dark mode,
!IMPORTANT: The tokens for light and dark mode are duplicated, if you change a token for dark mode,
!you should change that for the other dark mode too

*/

:root {
color-scheme: light;

--sk-back-h: 206;
--sk-selection-color: hsla(204, 100%, 63%, 0.3);

Expand All @@ -30,27 +32,64 @@
--sk-text-s: 1.6rem;
--sk-text-xs: 1.3rem;
--sk-line-max-width: 84rem;
}

body {
--sk-focus-outline: 0 0 0 2px hsla(var(--sk-theme-1-hsl), 0.6);

/* Base colors */
--sk-theme-1: hsl(var(--sk-theme-1-hsl));
--sk-theme-2: hsl(var(--sk-theme-2-hsl));
--sk-theme-3: hsl(var(--sk-theme-3-hsl));

--sk-back-3: hsla(var(--sk-back-3-hsl), 1);
--sk-back-2: hsla(var(--sk-back-2-hsl), 1);
--sk-back-3: hsla(var(--sk-back-3-hsl), 1);

--sk-code-bg: var(--sk-back-3);

--sk-text-warning: hsl(var(--sk-text-warning-hsl));
}

@media only screen and (prefers-color-scheme: dark) {
:root {
color-scheme: dark;
--sk-back-3-hsl: 206, 64%, 98%;
--sk-back-2-hsl: 0, 0%, 100%;

--sk-back-1: hsl(0, 0%, 100%);
--sk-back-4: hsl(210, 75%, 97%);
--sk-back-5: hsl(206, 20%, 80%);
--sk-theme-1-hsl: 12, 93%, 43%;
--sk-theme-2-hsl: 240, 8%, 44%;
--sk-theme-3-hsl: 204, 100%, 63%;
--sk-text-1: hsla(0, 0%, 0%, 0.95);
--sk-text-2: hsla(0, 0%, 0%, 0.73);
--sk-text-3: hsla(0, 0%, 0%, 0.55);
--sk-text-4: hsla(0, 0%, 0%, 0.35);
--sk-scrollbar: rgba(0, 0, 0, 0.3);
--sk-shadow: 0px 0px 14px rgba(0, 0, 0, 0.1);

/* same in light mode, different in dark mode */
--sk-theme-1-variant: hsl(15, 100%, 50%);
--sk-theme-2-variant: hsl(240, 8%, 44%);
--sk-theme-3-variant: hsl(204, 100%, 63%);

--sk-code-ts-bg: var(--sk-back-1);
--sk-code-base: hsl(45, 7%, 35%);
--sk-code-comment: hsl(0, 0%, 41%);
--sk-code-keyword: hsl(204, 88%, 35%);
--sk-code-function: hsl(19, 67%, 44%);
--sk-code-string: hsl(41, 37%, 38%);
--sk-code-number: hsl(120, 100%, 25%);
--sk-code-template-string: hsl(2, 80%, 47%);
--sk-code-tags: var(--sk-code-function);
--sk-code-important: var(--sk-code-string);
--sk-code-diff-base: hsla(0, 0%, 0%, 0.6);
--sk-code-diff-inserted: hsl(120, 100%, 25%);
--sk-code-diff-removed: hsl(2, 80%, 47%);

--sk-text-warning-hsl: 32, 95%, 44%;

/* used for coloured backgrounds e.g. blockquotes */
--sk-back-translucent: hsla(0, 0%, 0%, 0.1);
--sk-text-translucent: hsla(0, 0%, 0%, 0.7);

&.dark {
color-scheme: light;

--sk-back-3-hsl: 0, 0%, 14%;
--sk-back-2-hsl: 0, 0%, 18%;
Expand All @@ -70,13 +109,14 @@ body {
--sk-scrollbar: rgba(255, 255, 255, 0.3);
--sk-shadow: 0px 0px 0 1px var(--sk-back-4);

--sk-back-3-hsl: 0, 0%, 14%;
--sk-theme-1-variant: hsl(15, 100%, 40%);
--sk-theme-2-variant: hsl(240, 8%, 35%);
--sk-theme-3-variant: hsl(204, 100%, 50%);

--sk-text-warning-hsl: 32, 67%, 56%;

--sk-code-ts-bg: hsl(var(--sk-back-2-hsl));
--sk-code-ts-bg: var(--sk-back-2);
--sk-code-base: hsl(45, 7%, 75%);
--sk-code-comment: hsl(0, 0%, 55%);
--sk-code-keyword: hsl(204, 88%, 65%);
Expand All @@ -90,51 +130,6 @@ body {
--sk-code-diff-inserted: hsl(120, 46%, 48%);
--sk-code-diff-removed: hsl(2, 64%, 70%);
}

body.light {
color-scheme: light;

--sk-back-3-hsl: 206, 64%, 98%;
--sk-back-2-hsl: 0, 0%, 100%;

--sk-back-1: hsl(0, 0%, 100%);
--sk-back-4: hsl(210, 75%, 97%);
--sk-back-5: hsl(206, 20%, 80%);
--sk-theme-1-hsl: 12, 93%, 43%;
--sk-theme-2-hsl: 240, 8%, 44%;
--sk-theme-3-hsl: 204, 100%, 63%;
--sk-text-1: hsla(0, 0%, 0%, 0.95);
--sk-text-2: hsla(0, 0%, 0%, 0.73);
--sk-text-3: hsla(0, 0%, 0%, 0.55);
--sk-text-4: hsla(0, 0%, 0%, 0.35);
--sk-scrollbar: rgba(0, 0, 0, 0.3);
--sk-shadow: 0px 0px 14px rgba(0, 0, 0, 0.1);

/* same in light mode, different in dark mode */
--sk-theme-1-variant: hsl(15, 100%, 50%);
--sk-theme-2-variant: hsl(240, 8%, 44%);
--sk-theme-3-variant: hsl(204, 100%, 63%);

--sk-code-ts-bg: var(--sk-back-1);
--sk-code-base: hsl(45, 7%, 35%);
--sk-code-comment: hsl(0, 0%, 41%);
--sk-code-keyword: hsl(204, 88%, 35%);
--sk-code-function: hsl(19, 67%, 44%);
--sk-code-string: hsl(41, 37%, 38%);
--sk-code-number: hsl(120, 100%, 25%);
--sk-code-template-string: hsl(2, 80%, 47%);
--sk-code-tags: var(--sk-code-function);
--sk-code-important: var(--sk-code-string);
--sk-code-diff-base: hsla(0, 0%, 0%, 0.6);
--sk-code-diff-inserted: hsl(120, 100%, 25%);
--sk-code-diff-removed: hsl(2, 80%, 47%);

--sk-text-warning-hsl: 32, 95%, 44%;

/* used for coloured backgrounds e.g. blockquotes */
--sk-back-translucent: hsla(0, 0%, 0%, 0.1);
--sk-text-translucent: hsla(0, 0%, 0%, 0.7);
}
}

@media screen and (min-width: 480px) {
Expand All @@ -151,93 +146,3 @@ body {
--sk-page-padding-side: 4.8rem;
}
}

@media screen and (prefers-color-scheme: light) {
:root {
color-scheme: light;

--sk-back-3-hsl: 206, 64%, 98%;
--sk-back-2-hsl: 0, 0%, 100%;

--sk-back-1: hsl(0, 0%, 100%);
--sk-back-4: hsl(210, 75%, 97%);
--sk-back-5: hsl(206, 20%, 80%);
--sk-theme-1-hsl: 12, 93%, 43%;
--sk-theme-2-hsl: 240, 8%, 44%;
--sk-theme-3-hsl: 204, 100%, 63%;
--sk-text-1: hsla(0, 0%, 0%, 0.95);
--sk-text-2: hsla(0, 0%, 0%, 0.73);
--sk-text-3: hsla(0, 0%, 0%, 0.55);
--sk-text-4: hsla(0, 0%, 0%, 0.35);
--sk-scrollbar: rgba(0, 0, 0, 0.3);
--sk-shadow: 0px 0px 14px rgba(0, 0, 0, 0.1);

/* same in light mode, different in dark mode */
--sk-theme-1-variant: hsl(15, 100%, 50%);
--sk-theme-2-variant: hsl(240, 8%, 44%);
--sk-theme-3-variant: hsl(204, 100%, 63%);

--sk-code-ts-bg: var(--sk-back-1);
--sk-code-base: hsl(45, 7%, 35%);
--sk-code-comment: hsl(0, 0%, 41%);
--sk-code-keyword: hsl(204, 88%, 35%);
--sk-code-function: hsl(19, 67%, 44%);
--sk-code-string: hsl(41, 37%, 38%);
--sk-code-number: hsl(120, 100%, 25%);
--sk-code-template-string: hsl(2, 80%, 47%);
--sk-code-tags: var(--sk-code-function);
--sk-code-important: var(--sk-code-string);
--sk-code-diff-base: hsla(0, 0%, 0%, 0.4);
--sk-code-diff-inserted: hsl(120, 100%, 25%);
--sk-code-diff-removed: hsl(2, 80%, 47%);

--sk-text-warning-hsl: 32, 95%, 44%;

/* used for coloured backgrounds e.g. blockquotes */
--sk-back-translucent: hsla(0, 0%, 0%, 0.1);
--sk-text-translucent: hsla(0, 0%, 0%, 0.7);
}

body.dark {
color-scheme: dark;

--sk-back-3-hsl: 0, 0%, 14%;
--sk-back-2-hsl: 0, 0%, 18%;

--sk-back-1: hsl(0, 0%, 10%);
--sk-back-4: hsl(0, 0%, 22%);
--sk-back-5: hsl(0, 0%, 40%);
--sk-back-translucent: hsla(0, 0%, 100%, 0.1);
--sk-theme-1-hsl: 12, 94%, 62%;
--sk-theme-2-hsl: 240, 8%, 44%;
--sk-theme-3-hsl: 204, 100%, 63%;
--sk-text-1: hsl(0, 0%, 90%);
--sk-text-2: hsl(0, 0%, 80%);
--sk-text-3: hsl(0, 0%, 65%);
--sk-text-4: hsl(0, 0%, 45%);
--sk-text-translucent: hsla(0, 0%, 100%, 0.9);
--sk-scrollbar: rgba(255, 255, 255, 0.3);
--sk-shadow: 0px 0px 0 1px var(--sk-back-4);

--sk-back-3-hsl: 0, 0%, 14%;
--sk-theme-1-variant: hsl(15, 100%, 40%);
--sk-theme-2-variant: hsl(240, 8%, 35%);
--sk-theme-3-variant: hsl(204, 100%, 50%);

--sk-text-warning-hsl: 32, 67%, 56%;

--sk-code-ts-bg: var(--sk-back-2);
--sk-code-base: hsl(45, 7%, 75%);
--sk-code-comment: hsl(0, 0%, 55%);
--sk-code-keyword: hsl(204, 88%, 65%);
--sk-code-function: hsl(19, 67%, 75%);
--sk-code-string: hsl(41, 37%, 68%);
--sk-code-number: hsl(120, 100%, 25%);
--sk-code-template-string: hsl(2, 80%, 47%);
--sk-code-tags: var(--sk-code-function);
--sk-code-important: var(--sk-code-string);
--sk-code-diff-base: hsla(0, 0%, 100%, 0.5);
--sk-code-diff-inserted: hsl(120, 46%, 48%);
--sk-code-diff-removed: hsl(2, 64%, 70%);
}
}
Loading