From bb50cccfa292e4bf205c45ed9145f137febaf46d Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 2 Oct 2024 19:00:33 -0400 Subject: [PATCH 1/2] DM Serif Display --- packages/site-kit/package.json | 2 ++ .../site-kit/src/lib/docs/DocsContents.svelte | 3 +-- packages/site-kit/src/lib/styles/base.css | 2 +- packages/site-kit/src/lib/styles/index.css | 5 +++++ packages/site-kit/src/lib/styles/tokens.css | 2 +- pnpm-lock.yaml | 16 ++++++++++++++++ 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/packages/site-kit/package.json b/packages/site-kit/package.json index 7c06dcf4e1..5f074a0025 100644 --- a/packages/site-kit/package.json +++ b/packages/site-kit/package.json @@ -22,8 +22,10 @@ }, "homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/site-kit#readme", "dependencies": { + "@fontsource/dm-serif-display": "^5.1.0", "@fontsource/eb-garamond": "^5.1.0", "@fontsource/fira-mono": "^5.1.0", + "@fontsource/playfair-display": "^5.1.0", "@fontsource/yantramanav": "^5.1.0", "esm-env": "^1.0.0", "json5": "^2.2.3", diff --git a/packages/site-kit/src/lib/docs/DocsContents.svelte b/packages/site-kit/src/lib/docs/DocsContents.svelte index c5056f0310..3df01c3b73 100644 --- a/packages/site-kit/src/lib/docs/DocsContents.svelte +++ b/packages/site-kit/src/lib/docs/DocsContents.svelte @@ -74,7 +74,7 @@ li { display: block; - line-height: 1.2; + /* line-height: 1.2; */ margin: 0; margin-bottom: 4rem; } @@ -105,7 +105,6 @@ display: block; font-size: var(--sk-text-s); font-family: var(--sk-font-body); - padding-bottom: 0.6em; } [aria-current='page'] { diff --git a/packages/site-kit/src/lib/styles/base.css b/packages/site-kit/src/lib/styles/base.css index cbf9703ff1..96607d4497 100644 --- a/packages/site-kit/src/lib/styles/base.css +++ b/packages/site-kit/src/lib/styles/base.css @@ -20,7 +20,7 @@ body { body { font-size: var(--sk-text-s); font-family: var(--sk-font-body); - line-height: 1.618; + line-height: 1.5; color: var(--sk-text-2); background-color: var(--sk-back-1); width: 100%; diff --git a/packages/site-kit/src/lib/styles/index.css b/packages/site-kit/src/lib/styles/index.css index 19f1021d36..aec3260b64 100644 --- a/packages/site-kit/src/lib/styles/index.css +++ b/packages/site-kit/src/lib/styles/index.css @@ -1,6 +1,11 @@ @import '@fontsource/eb-garamond'; @import '@fontsource/eb-garamond/500.css'; @import '@fontsource/eb-garamond/400-italic.css'; +@import '@fontsource/playfair-display/600.css'; +@import '@fontsource/dm-serif-display'; +@import '@fontsource/libre-bodoni'; +@import '@fontsource/inter-tight'; +@import '@fontsource/inter-tight/500.css'; @import '@fontsource/fira-mono'; /* TODO figure out which weights we actually need */ diff --git a/packages/site-kit/src/lib/styles/tokens.css b/packages/site-kit/src/lib/styles/tokens.css index d5eed682c4..366041f8dc 100644 --- a/packages/site-kit/src/lib/styles/tokens.css +++ b/packages/site-kit/src/lib/styles/tokens.css @@ -25,7 +25,7 @@ --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: var(--sk-font-body); + --sk-font-heading: 'DM Serif Display'; --sk-font-mono: 'Fira Mono', monospace; --sk-text-xxl: 3.6rem; --sk-text-xl: 3rem; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 01f39264b6..76e1d25113 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -346,12 +346,18 @@ importers: packages/site-kit: dependencies: + '@fontsource/dm-serif-display': + specifier: ^5.1.0 + version: 5.1.0 '@fontsource/eb-garamond': specifier: ^5.1.0 version: 5.1.0 '@fontsource/fira-mono': specifier: ^5.1.0 version: 5.1.0 + '@fontsource/playfair-display': + specifier: ^5.1.0 + version: 5.1.0 '@fontsource/yantramanav': specifier: ^5.1.0 version: 5.1.0 @@ -796,12 +802,18 @@ packages: cpu: [x64] os: [win32] + '@fontsource/dm-serif-display@5.1.0': + resolution: {integrity: sha512-8IGBpTOn2XRA09plE6iAlZajL09iwCdSTd60FiM9NsD7VV4Nqseo9tgqiZLyuLC9D1jht5i39I2IYI/o2+Q0Kg==} + '@fontsource/eb-garamond@5.1.0': resolution: {integrity: sha512-FEIWkPgBY9CEhZP1YmA36k/f5Hj4z1Tv2FxIiG8aYHmkKGZNVCVIeO345lCVtpG32ZVQKs8te+JpVtg/GCHXyg==} '@fontsource/fira-mono@5.1.0': resolution: {integrity: sha512-6+nftSKApXyN0I9FC5GJuG5TUCh+in5OehtrXRIsHJvq38Pm//oA1kZZYNdXv99JYzLzJ3lzsTAavmS+xGLGDw==} + '@fontsource/playfair-display@5.1.0': + resolution: {integrity: sha512-O4Ph7IwM2sH4IpSgYKP1ZdOuaYd22+eXdT1jU8/kDM6gIABV2RoqJM34Z+WD364+mO1noXPcF1ZtA4aRfcFZLA==} + '@fontsource/yantramanav@5.1.0': resolution: {integrity: sha512-wSmYmoGhFbYF4XUXouudROqTn6GREe0HTV/HqcnRLYbQJNa3kmqbcebIm9PxPDQ0l3y2speJAlbOoDGM2DN9dg==} @@ -3300,10 +3312,14 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true + '@fontsource/dm-serif-display@5.1.0': {} + '@fontsource/eb-garamond@5.1.0': {} '@fontsource/fira-mono@5.1.0': {} + '@fontsource/playfair-display@5.1.0': {} + '@fontsource/yantramanav@5.1.0': {} '@img/sharp-darwin-arm64@0.33.4': From 6583c7f780593234f5176760a8d24bb26cbbc810 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Wed, 2 Oct 2024 19:10:32 -0400 Subject: [PATCH 2/2] remove some unused stuff --- packages/site-kit/src/lib/styles/index.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/site-kit/src/lib/styles/index.css b/packages/site-kit/src/lib/styles/index.css index aec3260b64..7a0ebb64b7 100644 --- a/packages/site-kit/src/lib/styles/index.css +++ b/packages/site-kit/src/lib/styles/index.css @@ -3,9 +3,6 @@ @import '@fontsource/eb-garamond/400-italic.css'; @import '@fontsource/playfair-display/600.css'; @import '@fontsource/dm-serif-display'; -@import '@fontsource/libre-bodoni'; -@import '@fontsource/inter-tight'; -@import '@fontsource/inter-tight/500.css'; @import '@fontsource/fira-mono'; /* TODO figure out which weights we actually need */