Skip to content

Typography experiments #120

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

Closed
wants to merge 1 commit into from
Closed

Typography experiments #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 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-body);
font-size: 1.6rem;
color: var(--sk-text-1);
line-height: 1;
Expand All @@ -310,7 +310,7 @@ export default app;`
background: transparent;
border: none;
color: currentColor;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
font-size: 1.6rem;
opacity: 0.7;
outline: none;
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-body);
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
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: 400 12px/1.5 var(--sk-font-body);
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
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 12px/1.7 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: 400 12px/1.5 var(--sk-font-body);
border: none;
border-bottom: 3px solid transparent;
padding: 12px 12px 8px 12px;
Expand Down
2 changes: 1 addition & 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,7 @@
}

.panel-heading {
font: 700 12px/1.5 var(--sk-font);
font: 700 12px/1.5 var(--sk-font-body);
color: var(--sk-text-1, #333);
flex: 1;
text-align: left;
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
2 changes: 2 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,8 @@
},
"homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/site-kit#readme",
"dependencies": {
"@fontsource/cardo": "^5.1.0",
"@fontsource/oswald": "^5.1.0",
"esm-env": "^1.0.0",
"json5": "^2.2.3",
"svelte-persisted-store": "^0.9.2"
Expand Down
5 changes: 3 additions & 2 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 @@ -78,6 +78,7 @@
display: block;
padding-bottom: 0.8rem;
font-size: var(--sk-text-s);
font-family: var(--sk-font-heading);
text-transform: uppercase;
letter-spacing: 0.1em;
font-weight: 600;
Expand All @@ -87,7 +88,7 @@
.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
3 changes: 2 additions & 1 deletion packages/site-kit/src/lib/styles/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ body {

body {
font-size: 1.6rem;
font-family: var(--sk-font);
font-family: var(--sk-font-body);
line-height: 1.618;
color: var(--sk-text-2);
background-color: var(--sk-back-1);
Expand Down Expand Up @@ -84,6 +84,7 @@ h1 {

:where(h1, h2, h3, h4, h5, h6) {
position: relative;
font-family: var(--sk-font-heading);
font-weight: 400;
line-height: 1.35;
color: var(--sk-text-1);
Expand Down
8 changes: 6 additions & 2 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,3 +1,6 @@
@import '@fontsource/cardo';
@import '@fontsource/oswald';

/*

!IMPORTANT: The tokens for light and dark mode are duplicated, if you change a token for dark mode,
Expand All @@ -22,8 +25,9 @@
--sk-banner-bottom-height: 0px;

/* typography */
--sk-font: 'Overpass', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
--sk-font: 'Overpass', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
--sk-font-heading: 'Oswald';
--sk-font-body: Cardo;
--sk-font-mono: 'Fira Mono', monospace;
--sk-text-xxl: 3.6rem;
--sk-text-xl: 3rem;
Expand Down
16 changes: 16 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading