Skip to content

More token tweaks #751

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 10 commits into from
Nov 1, 2024
Merged

More token tweaks #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ac34274
rename border tokens
Rich-Harris Nov 1, 2024
e3917e9
Merge branch 'main' into bg-tokens
Rich-Harris Nov 1, 2024
91cc08a
fix
Rich-Harris Nov 1, 2024
425056d
Merge branch 'main' into bg-tokens
Rich-Harris Nov 1, 2024
6939537
get rid of --sk-bg-5
Rich-Harris Nov 1, 2024
18c6459
fix border usage
Rich-Harris Nov 1, 2024
333d740
fixes
Rich-Harris Nov 1, 2024
f1f7956
move raised styles into buttons.css, add comment on usage
Rich-Harris Nov 1, 2024
63e56a9
prettier
Rich-Harris Nov 1, 2024
42f9e8d
more
Rich-Harris Nov 1, 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
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/lib/components/PageControls.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

.controls {
max-width: calc(var(--sk-page-content-width) + 1rem);
border-top: 1px solid var(--sk-border-medium);
border-top: 1px solid var(--sk-border);
padding: 1rem 0 0 0;
margin: 1rem 0 0 0;
text-wrap: balance;
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/(authed)/apps/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
padding: 0.5rem 1rem;
line-height: 1;
display: flex;
border: 1px solid var(--sk-border-medium);
border: 1px solid var(--sk-border);
border-radius: var(--sk-border-radius);
z-index: 2;
font: var(--sk-font-ui-large);
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/(authed)/playground/[id]/AppControls.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@

input {
background: transparent;
border: 1px solid var(--sk-border-medium);
border: 1px solid var(--sk-border);
border-radius: var(--sk-border-radius);
color: currentColor;
width: 0;
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/tutorial/[...slug]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
/* we transform the default state, rather than the editor state, because otherwise
the positioning of tooltips is wrong (doesn't take into account transforms) */
transform: translate(50%, 0);
border-top: 1px solid var(--sk-border-medium);
border-top: 1px solid var(--sk-border);
}

.top.offset {
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/tutorial/[...slug]/Chrome.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
input {
flex: 1;
padding: 0.2rem 0.6rem;
border: 1px solid var(--sk-border-medium);
border: 1px solid var(--sk-border);
/* TODO this should apply to all buttons/inputs? */
border-radius: var(--sk-border-radius);
color: var(--sk-fg-1);
Expand Down
6 changes: 3 additions & 3 deletions packages/editor/src/lib/codemirror.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@

&.cm-panels-top,
&.cm-panels-bottom {
border-top: 1px solid var(--sk-border-medium);
border-bottom: 1px solid var(--sk-border-medium);
border-top: 1px solid var(--sk-border);
border-bottom: 1px solid var(--sk-border);
}

.cm-panel {
Expand Down Expand Up @@ -179,7 +179,7 @@
font: inherit;
background: inherit;
color: var(--sk-fg-1);
border: 1px solid var(--sk-border-medium);
border: 1px solid var(--sk-border);
border-radius: var(--sk-border-radius);
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Input/ComponentSelector.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
height: 1px;
bottom: 0px;
left: 0;
background-color: var(--sk-bg-4);
background-color: var(--sk-border);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Output/Output.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
height: 1px;
bottom: 0px;
left: 0;
background-color: var(--sk-bg-4);
background-color: var(--sk-border);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Output/console/ConsoleTable.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
margin: 8px;
overflow: auto;
max-height: 200px;
border: 1px solid var(--sk-border-medium);
border: 1px solid var(--sk-border);
border-radius: 2px;
overscroll-behavior: none;
}
Expand Down
4 changes: 0 additions & 4 deletions packages/repl/src/lib/Repl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,6 @@
}
}

.divider::after {
background-color: var(--sk-bg-5);
}

[data-pane='main'] > .divider::after {
height: calc(100% - var(--sk-pane-controls-height));
top: var(--sk-pane-controls-height);
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/components/Checkbox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
border-radius: 1em;
top: 0;
left: 0;
background: var(--sk-bg-5);
background: var(--sk-bg-4);
box-sizing: content-box;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/components/ScreenToggle.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
justify-content: center;
width: 100%;
height: var(--sk-pane-controls-height);
border-top: 1px solid var(--sk-border-medium);
border-top: 1px solid var(--sk-border);
font: var(--sk-font-ui-small);
z-index: 2;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/components/Text.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
.code-block {
position: relative;
background: var(--sk-bg-2);
border: 1px solid var(--sk-border-medium);
border: 1px solid var(--sk-border);
border-radius: var(--sk-border-radius);
overflow: hidden;
margin: calc(0.5 * var(--sk-line-height-body)) 0;
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/nav/MobileMenu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@
hr {
margin: 0.5rem 0;
height: 1px;
background: var(--sk-border-dark);
background: var(--sk-border);
border: none;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/nav/Nav.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
outline-offset: -2px;

&:hover {
box-shadow: inset 0 -1px 0 0 var(--sk-bg-5);
box-shadow: inset 0 -1px 0 0 var(--sk-border);
}

&[aria-current='page'] {
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/search/SearchBox.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ It appears when the user clicks on the `Search` component or presses the corresp
border: none;
flex-shrink: 0;
color: var(--sk-fg-1);
border-bottom: 1px solid var(--sk-border-dark);
border-bottom: 1px solid var(--sk-border);
background: inherit;

&::placeholder {
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/styles/text.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
padding-left: 1rem;
border-radius: 0;
box-shadow: none;
border-top: 1px solid var(--sk-bg-4);
border-top: 1px solid var(--sk-border);
}

.ts-block-property-details {
Expand Down
52 changes: 21 additions & 31 deletions packages/site-kit/src/lib/styles/tokens/colours.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
--sk-fg-4: hsl(0, 0%, 45%);
--sk-fg-accent: hsl(12, 93%, 43%);

/* Background colours */
--sk-bg-1: hsl(0, 0%, 100%);
--sk-bg-2: hsl(0, 0%, 100%);
--sk-bg-3: hsl(0, 0%, 99%);
--sk-bg-4: hsl(0, 0%, 95%);
--sk-bg-accent: var(--sk-fg-accent);
--sk-bg-selection: hsla(204, 100%, 63%, 0.3);

/* Border color — use this for all borders, except 'active' borders (e.g. current nav) which use `--sk-fg-accent` */
--sk-border: hsl(0, 0%, 92%);

/* Syntax highlighting — these come from `createCssVariablesTheme`, but are used elsewhere as well */
--shiki-color-text: var(--sk-fg-2);
--shiki-token-constant: var(--shiki-color-text);
--shiki-token-string: hsl(30, 100%, 30%);
Expand All @@ -26,26 +38,9 @@
--shiki-token-punctuation: var(--shiki-color-text);
--shiki-token-link: var(--shiki-token-keyword);

/* Background colours */
--sk-bg-1: hsl(0, 0%, 100%);
--sk-bg-2: hsl(0, 0%, 100%);
--sk-bg-3: hsl(0, 0%, 99%);
--sk-bg-4: hsl(0, 0%, 95%);
--sk-bg-5: hsl(0, 0%, 92%);
--sk-bg-accent: var(--sk-fg-accent);
--sk-bg-selection: hsla(204, 100%, 63%, 0.3);

/* Border colors */
--sk-border-light: hsl(0, 0%, 95%);
--sk-border-medium: hsl(0, 0%, 92%);
--sk-border-dark: hsl(0, 0%, 86%);

/* Misc */
--sk-scrollbar: rgba(0, 0, 0, 0.3);
--sk-shadow: drop-shadow(0px 0px 14px rgba(0, 0, 0, 0.1));

/* overrides */
--shiki-color-background: var(--sk-bg-2);
}

:root.dark {
Expand All @@ -60,29 +55,24 @@
--sk-fg-4: hsl(var(--sk-bg-hue), 10%, 45%);
--sk-fg-accent: hsl(12, 94%, 62%);

--shiki-color-text: hsl(45, 7%, 75%);
--shiki-token-comment: hsl(0, 0%, 55%);
--shiki-token-keyword: hsl(204, 88%, 65%);
--shiki-token-function: hsl(19, 67%, 75%);
--shiki-token-string: hsl(41, 37%, 68%);

/* Background colours */
--sk-bg-1: hsl(var(--sk-bg-hue), 15%, 8%);
--sk-bg-2: hsl(var(--sk-bg-hue), 15%, 15%);
--sk-bg-3: hsl(var(--sk-bg-hue), 15%, 12%);
--sk-bg-4: hsl(var(--sk-bg-hue), 15%, 22%);
--sk-bg-5: hsl(var(--sk-bg-hue), 15%, 25%);
--sk-bg-accent: hsl(15, 100%, 35%);

/* Border colours */
--sk-border-light: hsl(var(--sk-bg-hue), 15%, 32%);
--sk-border-medium: var(--sk-bg-5);
--sk-border-dark: var(--sk-bg-3);
/* Border colour */
--sk-border: hsl(var(--sk-bg-hue), 15%, 25%);

/* Syntax highlighting */
--shiki-color-text: hsl(45, 7%, 75%);
--shiki-token-comment: hsl(0, 0%, 55%);
--shiki-token-keyword: hsl(204, 88%, 65%);
--shiki-token-function: hsl(19, 67%, 75%);
--shiki-token-string: hsl(41, 37%, 68%);

/* Misc */
--sk-scrollbar: rgba(255, 255, 255, 0.3);
--sk-shadow: drop-shadow(1px 2px 16px rgba(0, 0, 0, 0.5));

/* overrides */
--shiki-color-background: var(--sk-bg-3);
}
33 changes: 20 additions & 13 deletions packages/site-kit/src/lib/styles/utils/buttons.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,29 @@
:root {
--sk-raised-border: var(--sk-border);
--sk-raised-highlight: hsl(0, 0%, 95%);
--sk-raised-shadow: hsl(0, 0%, 86%);

/* raised buttons */
--sk-raised-color: var(--sk-border-light) var(--sk-border-medium) var(--sk-border-medium)
var(--sk-border-light);
--sk-raised-hover-color: var(--sk-border-medium) var(--sk-border-dark) var(--sk-border-dark)
var(--sk-border-medium);
--sk-raised-active-color: var(--sk-border-dark) var(--sk-border-medium) var(--sk-border-medium)
var(--sk-border-dark);
--sk-raised-color: var(--sk-raised-highlight) var(--sk-raised-border) var(--sk-raised-border)
var(--sk-raised-highlight);
--sk-raised-hover-color: var(--sk-raised-border) var(--sk-raised-shadow) var(--sk-raised-shadow)
var(--sk-raised-border);
--sk-raised-active-color: var(--sk-raised-shadow) var(--sk-raised-border) var(--sk-raised-border)
var(--sk-raised-shadow);
--sk-raised-width: 1px 2px 2px 1px;
--sk-raised-active-width: 2px 1px 1px 2px;

&.dark {
--sk-raised-highlight: hsl(var(--sk-bg-hue), 15%, 32%);
--sk-raised-shadow: var(--sk-bg-3);

/* raised buttons */
--sk-raised-color: var(--sk-border-medium) var(--sk-border-dark) var(--sk-border-dark)
var(--sk-border-medium);
--sk-raised-hover-color: var(--sk-border-light) var(--sk-border-dark) var(--sk-border-dark)
var(--sk-border-light);
--sk-raised-active-color: var(--sk-border-dark) var(--sk-border-light) var(--sk-border-light)
var(--sk-border-dark);
--sk-raised-color: var(--sk-raised-border) var(--sk-raised-shadow) var(--sk-raised-shadow)
var(--sk-raised-border);
--sk-raised-hover-color: var(--sk-raised-highlight) var(--sk-raised-shadow)
var(--sk-raised-shadow) var(--sk-raised-highlight);
--sk-raised-active-color: var(--sk-raised-shadow) var(--sk-raised-highlight)
var(--sk-raised-highlight) var(--sk-raised-shadow);
}
}

Expand Down Expand Up @@ -54,7 +61,7 @@
}

&:disabled {
border-color: var(--sk-border-medium);
border-color: var(--sk-raised-border);
border-width: 1px;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/styles/utils/dividers.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.divider {
z-index: 2;
&::after {
background-color: var(--sk-bg-5) !important;
background-color: var(--sk-border) !important;
}
}
Loading