Skip to content

Yantramanav + Cardo #122

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 9 commits into from
Sep 26, 2024
Merged

Yantramanav + Cardo #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b4abb56
oswald+cardo
Rich-Harris Sep 26, 2024
27d0356
overpass+cardo
Rich-Harris Sep 26, 2024
5552973
Yantramanav + Cardo
Rich-Harris Sep 26, 2024
45745dc
various
Rich-Harris Sep 26, 2024
0f84c3b
prettier
Rich-Harris Sep 26, 2024
c080ff4
add a TODO
Rich-Harris Sep 26, 2024
bec2dcb
add web-safe fallbacks
Rich-Harris Sep 26, 2024
0e83551
use fontsource for fira mono, remove old font files
Rich-Harris Sep 26, 2024
8190529
prettier
Rich-Harris Sep 26, 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
6 changes: 3 additions & 3 deletions 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 @@ -288,7 +288,7 @@ export default app;`
padding: 0.2em;
opacity: 0.7;
transition: opacity 0.3s;
font-family: var(--sk-font);
font-family: var(--sk-font-heading);
font-size: 1.6rem;
color: var(--sk-text-1);
line-height: 1;
Expand All @@ -310,8 +310,8 @@ export default app;`
background: transparent;
border: none;
color: currentColor;
font-family: var(--sk-font);
font-size: 1.6rem;
font-family: var(--sk-font-heading);
font-size: var(--sk-text-m);
opacity: 0.7;
outline: none;
flex: 1;
Expand Down
4 changes: 2 additions & 2 deletions apps/svelte.dev/src/routes/(authed)/playground/[id]/UserMenu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
.name {
line-height: 1;
display: none;
font-family: var(--sk-font);
font-family: var(--sk-font-heading);
font-size: 1.6rem;
}

Expand Down Expand Up @@ -99,7 +99,7 @@
.menu button,
.menu a {
background-color: transparent;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
font-size: 1.6rem;
opacity: 0.7;
padding: 0.4rem 0;
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/+error.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
background-color: var(--sk-theme-2);
color: white;
padding: 12px 16px;
font: 600 16px/1.7 var(--sk-font);
font: 600 16px/1.7 var(--sk-font-body);
border-radius: 2px;
}
</style>
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/_home/Hero.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
strong {
font-size: var(--sk-text-l);
text-align: center;
font-family: var(--sk-font);
font-family: var(--sk-font-heading);
text-transform: lowercase;
font-weight: 400;
color: var(--sk-text-2);
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/_home/HeroSvelteKit.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
font-weight: 200;
line-height: 1.2;
color: var(--sk-text-2);
font-family: var(--sk-font);
font-family: var(--sk-font-body);
margin-bottom: 2rem;
/* max-width: 12em; */
/* margin: 0 auto; */
Expand Down
1 change: 1 addition & 0 deletions apps/svelte.dev/src/routes/blog/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
.post:where(:first-child, :nth-child(2))::before {
content: 'Latest post • ' attr(data-pubdate);
color: var(--sk-theme-3);
font-family: var(--sk-font-heading);
font-size: var(--sk-text-xs);
font-weight: 400;
letter-spacing: 0.05em;
Expand Down
6 changes: 4 additions & 2 deletions apps/svelte.dev/src/routes/docs/[...path]/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
line-height: 1;
z-index: 2;
margin: 6rem 0 2rem 0;
font-family: var(--sk-font-heading);

a {
text-decoration: none;
Expand Down Expand Up @@ -102,9 +103,10 @@

.controls span {
display: block;
font-size: 1.2rem;
font-size: var(--sk-text-s);
text-transform: uppercase;
font-weight: 600;
font-weight: 400;
font-family: var(--sk-font-heading);
color: var(--sk-text-3);
}

Expand Down
7 changes: 3 additions & 4 deletions apps/svelte.dev/src/routes/docs/[...path]/OnThisPage.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}

label {
text-transform: uppercase;
font-family: var(--sk-font-heading);
display: block;
}

Expand Down Expand Up @@ -138,10 +138,9 @@
}

& label {
font-size: var(--sk-text-s);
font-size: var(--sk-text-m);

letter-spacing: 0.1em;
font-weight: 600;
font-weight: 500;
display: block;

&::before {
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -67,6 +67,7 @@
input {
flex: 1;
padding: 0.5rem 1rem 0.4rem 1rem;
border: none;
background-color: var(--sk-back-3);
color: var(--sk-text-1);
font-family: inherit;
Expand Down
1 change: 1 addition & 0 deletions apps/svelte.dev/src/routes/tutorial/[slug]/Loading.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
justify-content: center;
background: var(--sk-back-2);
user-select: none;
font-family: var(--sk-font-heading);
}

.progress-container {
Expand Down
3 changes: 2 additions & 1 deletion apps/svelte.dev/src/routes/tutorial/[slug]/Menu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@

header strong,
h1 {
font-size: var(--sk-text-xs);
font-size: var(--sk-text-s);
}

.menu {
Expand Down Expand Up @@ -251,6 +251,7 @@
text-align: center;
color: var(--sk-text-2);
font-weight: 400;
font-size: var(--sk-text-s);
}

h1 .desktop {
Expand Down
3 changes: 2 additions & 1 deletion apps/svelte.dev/src/routes/tutorial/[slug]/Sidebar.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@

footer .edit {
color: var(--sk-text-2);
font-size: 1.4rem;
font-family: var(--sk-font-heading);
font-size: var(--sk-text-s);
padding: 0 0 0 1.4em;
background: url($lib/icons/file-edit.svg) no-repeat 0 calc(50% - 0.1em);
background-size: 1em 1em;
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/tutorial/[slug]/codemirror.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
}

.cm-editor .cm-scroller {
font-family: var(--font-mono);
font-family: var(--sk-font-mono);
font-size: 1.3rem;
line-height: 2rem;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/svelte.dev/src/routes/tutorial/[slug]/filetree/Filetree.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

<style>
.filetree {
--font-size: 1.4rem;
--font-size: var(--sk-text-s);
flex: 1;
overflow-y: auto;
overflow-x: hidden;
Expand Down
4 changes: 2 additions & 2 deletions apps/svelte.dev/src/routes/tutorial/[slug]/filetree/Item.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@
background-size: 1.2rem 1.2rem;
background-position: 0 45%;
background-repeat: no-repeat;
font-family: var(--sk-font-heading);
font-size: var(--sk-text-s);
}

:focus-visible {
Expand All @@ -133,7 +135,6 @@
margin: 0 0.5rem 0 calc(0.5rem + var(--inset));
padding: 0 0.5rem;
font-size: var(--font-size);
font-family: inherit;
}

.basename {
Expand All @@ -142,7 +143,6 @@
margin: 0;
padding: 0 1rem 0 calc(1rem + var(--inset));
font-size: var(--font-size);
font-family: inherit;
color: inherit;
flex: 1;
height: 100%;
Expand Down
4 changes: 2 additions & 2 deletions packages/repl/src/lib/CodeMirror.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@
.cm-tooltip {
border: none;
background: var(--sk-back-3);
font-family: var(--sk-font);
font-family: var(--sk-font-body);
max-width: calc(100vw - 10em);
position: relative;
filter: drop-shadow(2px 4px 6px rgba(0, 0, 0, 0.1));
Expand Down Expand Up @@ -369,7 +369,7 @@
}

.cm-diagnostic :not(code) {
font-family: var(--sk-font);
font-family: var(--sk-font-body);
}

.cm-diagnosticText {
Expand Down
4 changes: 2 additions & 2 deletions packages/repl/src/lib/Input/ComponentSelector.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@
.add-new {
position: relative;
display: inline-block;
font: 400 12px/1.5 var(--sk-font);
font: 300 var(--sk-text-s) / 1.8rem var(--sk-font-heading);
background: var(--sk-back-1);
border: none;
border-bottom: 3px solid transparent;
Expand Down Expand Up @@ -339,7 +339,7 @@
width: 100%;
left: 16px;
top: 12px;
font: 400 12px/1.5 var(--sk-font);
font: 400 12px/1.5 var(--sk-font-body);
border: none;
color: var(--sk-theme-3);
outline: none;
Expand Down
4 changes: 3 additions & 1 deletion packages/repl/src/lib/Input/Migrate.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,13 @@
</div>

<style>
/* TODO this is duplicated with RunesInfo.svelte */
button {
position: relative;
display: flex;
text-transform: uppercase;
font-size: 1.4rem;
font-weight: 300;
font-size: var(--sk-text-s);
padding: 0.8rem;
gap: 0.5rem;
margin-right: 0.3rem;
Expand Down
3 changes: 2 additions & 1 deletion packages/repl/src/lib/Input/RunesInfo.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
position: relative;
display: flex;
text-transform: uppercase;
font-size: 1.4rem;
font-weight: 300;
font-size: var(--sk-text-s);
padding: 0.8rem;
gap: 0.5rem;
margin-right: 0.3rem;
Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Message.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
position: relative;
color: white;
padding: 12px 16px 12px 44px;
font: 400 12px/1.7 var(--sk-font);
font: 400 var(--sk-text-s) / 1.8rem var(--sk-font-body);
margin: 0;
border-top: 1px solid white;
}
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 @@ -118,7 +118,7 @@
background: var(--sk-back-1, white);
text-align: left;
position: relative;
font: 400 12px/1.5 var(--sk-font);
font: 300 var(--sk-text-s) / 1.8rem var(--sk-font-heading);
border: none;
border-bottom: 3px solid transparent;
padding: 12px 12px 8px 12px;
Expand Down
3 changes: 2 additions & 1 deletion packages/repl/src/lib/Output/PaneWithPanel.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@
}

.panel-heading {
font: 700 12px/1.5 var(--sk-font);
font: 400 var(--sk-text-s) / 1.8rem var(--sk-font-heading);
text-transform: uppercase;
color: var(--sk-text-1, #333);
flex: 1;
text-align: left;
Expand Down
3 changes: 2 additions & 1 deletion packages/repl/src/lib/Output/Viewer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,8 @@

button {
color: var(--sk-text-2, #999);
font-size: 12px;
font-size: var(--sk-text-s);
font-family: var(--sk-font-heading);
text-transform: uppercase;
display: block;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/repl/src/lib/Output/console/ConsoleLine.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@

.meta {
color: var(--sk-text-2, #666);
font-family: var(--sk-font) !important;
font-family: var(--sk-font-body) !important;
font-size: 12px;
}

Expand Down
3 changes: 3 additions & 0 deletions packages/site-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
},
"homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/site-kit#readme",
"dependencies": {
"@fontsource/cardo": "^5.1.0",
"@fontsource/fira-mono": "^5.1.0",
"@fontsource/yantramanav": "^5.1.0",
"esm-env": "^1.0.0",
"json5": "^2.2.3",
"svelte-persisted-store": "^0.9.2"
Expand Down
11 changes: 5 additions & 6 deletions packages/site-kit/src/lib/docs/DocsContents.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

.sidebar {
padding: 3.2rem;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
height: 100%;
bottom: auto;
width: 100%;
Expand Down Expand Up @@ -77,17 +77,16 @@
.section {
display: block;
padding-bottom: 0.8rem;
font-size: var(--sk-text-s);
text-transform: uppercase;
letter-spacing: 0.1em;
font-weight: 600;
font-size: var(--sk-text-m);
font-family: var(--sk-font-heading);
font-weight: 500;
color: var(--sk-text-2);
}

.page {
display: block;
font-size: 1.6rem;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
padding-bottom: 0.6em;
}

Expand Down
3 changes: 2 additions & 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 @@ -143,11 +143,12 @@ Top navigation bar for the application. It provides a slot for the left side, th
height: var(--sk-nav-height);
margin: 0 auto;
background-color: var(--sk-back-2);
font-family: var(--sk-font);
font-family: var(--sk-font-body);
user-select: none;
transition: 0.4s var(--quint-out);
transition-property: transform, background;
isolation: isolate;
font-family: var(--sk-font-heading);
}

nav::after {
Expand Down
4 changes: 2 additions & 2 deletions packages/site-kit/src/lib/nav/NavContextMenu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
nav {
padding: 0.29rem;
padding-top: 0;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
overflow-y: auto;

height: 100%;
Expand Down Expand Up @@ -174,7 +174,7 @@
font-size: 1.1rem;
font-weight: 600;
letter-spacing: 1px;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
line-height: 1;
color: var(--sk-theme-1);
background: hsla(var(--sk-theme-1-hsl), 0.1);
Expand Down
Loading
Loading