Skip to content

use Fira Sans for UI elements #232

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 4 commits into from
Oct 3, 2024
Merged

use Fira Sans for UI elements #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a9b02e
use Fira Sans
Rich-Harris Oct 3, 2024
5a1aa78
simplify font stacks
Rich-Harris Oct 3, 2024
0fec902
fixes
Rich-Harris Oct 3, 2024
d15fb3c
fixes
Rich-Harris Oct 3, 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
1 change: 1 addition & 0 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 @@ -317,6 +317,7 @@ export default app;`
margin: 0 0.2em 0 0.4rem;
padding-top: 0.2em;
border-bottom: 1px solid transparent;
font-size: var(--sk-font-size-ui-medium);
}

input:hover {
Expand Down
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 @@ -94,7 +94,7 @@
background: var(--sk-theme-1);
padding: 0.35em 0.8em;
font-family: var(--sk-font-ui);
letter-spacing: 0.05em;
font-size: var(--sk-font-size-ui-medium);
font-weight: 600;
white-space: nowrap;
border-radius: var(--sk-border-radius);
Expand Down
16 changes: 12 additions & 4 deletions apps/svelte.dev/src/routes/blog/[slug]/card.png/+server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { read } from '$app/server';
import satori from 'satori';
import { html as toReactNode } from 'satori-html';
import Card from './Card.svelte';
import YantramanavRegular from './Yantramanav-Regular.ttf?url';
import DMSerifDisplay from './DMSerifDisplay-Regular.ttf?url';
import FiraSans from './FiraSans-Regular.ttf?url';
import { blog_posts } from '$lib/server/content';

export const prerender = true;
Expand All @@ -18,7 +19,8 @@ export function entries() {

const height = 630;
const width = 1200;
const data = await read(YantramanavRegular).arrayBuffer();
const dm_serif_display = await read(DMSerifDisplay).arrayBuffer();
const fira_sans = await read(FiraSans).arrayBuffer();

export async function GET({ params }) {
const post = blog_posts.find((post) => post.slug === `blog/${params.slug}`);
Expand All @@ -31,8 +33,14 @@ export async function GET({ params }) {
const svg = await satori(element, {
fonts: [
{
name: 'Overpass',
data,
name: 'DMSerif Display',
data: dm_serif_display,
style: 'normal',
weight: 400
},
{
name: 'Fira Sans',
data: fira_sans,
style: 'normal',
weight: 400
}
Expand Down
3 changes: 2 additions & 1 deletion apps/svelte.dev/src/routes/blog/[slug]/card.png/Card.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
display: flex;
width: 100%;
height: 100%;
font-family: 'Yantramanav';
background: white;
}

Expand Down Expand Up @@ -49,12 +48,14 @@
font-weight: 400;
line-height: 80px;
margin: 0 0 0.5em 0;
font-family: 'DM Serif Display';
}

.date {
font-size: 32px;
margin: 0;
color: #555;
text-transform: uppercase;
font-family: 'Fira Sans';
}
</style>
Binary file added apps/svelte.dev/src/routes/blog/[slug]/card.png/DMSerifDisplay-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file added apps/svelte.dev/src/routes/blog/[slug]/card.png/FiraSans-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed apps/svelte.dev/src/routes/blog/[slug]/card.png/Overpass-Regular.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed apps/svelte.dev/src/routes/blog/[slug]/card.png/Yantramanav-Regular.ttf
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions apps/svelte.dev/src/routes/docs/+page.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,8 @@
max-width: 50rem;
}
}

a {
font-size: var(--sk-font-size-body-small);
}
</style>
4 changes: 4 additions & 0 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 @@ -115,6 +115,10 @@
color: var(--sk-text-3);
}

.controls a {
font-size: var(--sk-font-size-body-small);
}

.controls span.faded {
opacity: 0.4;
}
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -395,6 +395,7 @@
border-right: 1px solid var(--sk-back-4);
color: white;
opacity: 1;
font-size: var(--sk-font-size-ui-small);
}

.navigator .solve:disabled {
Expand Down
2 changes: 2 additions & 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 @@ -162,10 +162,12 @@
h2 {
font-family: var(--sk-font-ui);
font-size: var(--sk-font-size-ui-large);
margin: 0 0 0.5em 0;
}

p {
margin: 0 0 1em 0;
font-size: var(--sk-font-size-ui-medium);
}

button {
Expand Down
9 changes: 1 addition & 8 deletions 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 @@ -193,11 +193,9 @@
header strong,
h1 {
font-family: inherit;
font-size: var(--sk-font-size-ui-medium);
}

.menu {
font-size: var(--sk-font-size-ui-medium);
border: none;
}

Expand Down Expand Up @@ -252,7 +250,7 @@
text-overflow: ellipsis;
text-align: center;
color: var(--sk-text-2);
font-weight: 400;
font-size: var(--sk-font-size-ui-small);
}

h1 .desktop {
Expand Down Expand Up @@ -452,10 +450,5 @@
font-size: var(--sk-font-size-ui-small);
color: var(--sk-text-3);
}

h1 strong {
font-size: var(--sk-font-size-ui-medium) !important;
line-height: 1;
}
}
</style>
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: var(--sk-font-size-ui-medium);
--font-size: var(--sk-font-size-ui-small);
flex: 1;
overflow-y: auto;
overflow-x: hidden;
Expand Down
1 change: 1 addition & 0 deletions packages/site-kit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"@fontsource/dm-serif-display": "^5.1.0",
"@fontsource/eb-garamond": "^5.1.0",
"@fontsource/fira-mono": "^5.1.0",
"@fontsource/fira-sans": "^5.1.0",
"@fontsource/yantramanav": "^5.1.0",
"esm-env": "^1.0.0",
"json5": "^2.2.3",
Expand Down
1 change: 1 addition & 0 deletions packages/site-kit/src/lib/home/Footer.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<style>
footer {
max-width: 120rem;
font-size: var(--sk-font-size-body-small);
padding: 0 var(--sk-page-padding-side);
margin: 0 auto;
display: grid;
Expand Down
2 changes: 1 addition & 1 deletion packages/site-kit/src/lib/home/TrySection.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@

.copy {
text-align: left;
font-size: var(--sk-font-size-body);
}

h2 {
display: inline-block;
width: 25rem;
margin: 0 0 1rem;
}

Expand Down
1 change: 1 addition & 0 deletions packages/site-kit/src/lib/home/TryTerminal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
}

.terminal pre {
font-size: var(--sk-font-size-code);
padding: 1em;
}

Expand Down
1 change: 1 addition & 0 deletions packages/site-kit/src/lib/nav/Menu.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,7 @@
margin: 0.3rem 0;
height: 4rem;
color: var(--sk-text-2);
font-size: var(--sk-font-size-ui-medium);
}

.universal .contents,
Expand Down
8 changes: 7 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 @@ -159,13 +159,17 @@ Top navigation bar for the application. It provides a slot for the left side, th
background: linear-gradient(to top, rgba(0, 0, 0, 0.05), transparent);
}

a {
font-size: var(--sk-font-size-ui-medium);
}

.current-section {
display: flex;
align-items: center;
font-size: 0.8em;
color: var(--sk-text-3);
margin-left: 0.4em;
padding: 0.1rem 0 0 0;
font-size: var(--sk-font-size-ui-small);
}

@media (max-width: 800px) {
Expand All @@ -183,6 +187,7 @@ Top navigation bar for the application. It provides a slot for the left side, th
.menu :global(a) {
color: var(--sk-text-2);
line-height: 1;
font-size: var(--sk-font-size-ui-medium);
padding: 0.1rem 0.5rem 0 0.5rem;
white-space: nowrap;
height: 100%;
Expand Down Expand Up @@ -281,6 +286,7 @@ Top navigation bar for the application. It provides a slot for the left side, th

.appearance .caption {
display: block;
font-size: var(--sk-font-size-ui-medium);
}

nav :global(.large) {
Expand Down
1 change: 0 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 @@ -18,7 +18,6 @@ body {
}

body {
font-size: var(--sk-font-size-body-small);
font-family: var(--sk-font-body);
line-height: 1.5;
color: var(--sk-text-2);
Expand Down
1 change: 1 addition & 0 deletions packages/site-kit/src/lib/styles/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
@import '@fontsource/dm-serif-display';
@import '@fontsource/yantramanav/400.css';
@import '@fontsource/fira-mono';
@import '@fontsource/fira-sans';

@import './tokens.css';
@import './base.css';
Expand Down
7 changes: 3 additions & 4 deletions packages/site-kit/src/lib/styles/tokens.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
--sk-banner-bottom-height: 0px;

/* typography */
--sk-font-ui: 'Yantramanav', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu,
Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
--sk-font-body: 'EB Garamond', 'Big Caslon', Palatino, 'Book Antiqua', Cambria, serif;
--sk-font-heading: 'DM Serif Display';
--sk-font-ui: 'Fira Sans', -apple-system, sans-serif;
--sk-font-body: 'EB Garamond', Georgia, serif;
--sk-font-heading: 'DM Serif Display', Georgia, serif;
--sk-font-mono: 'Fira Mono', monospace;

--sk-font-size-h1: 3.6rem;
Expand Down
8 changes: 8 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