From 03e6343d9124719b61003f9670c74d76e41d6cbf Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 29 Sep 2024 13:10:04 -0400 Subject: [PATCH 1/2] use EB Garamond --- packages/site-kit/package.json | 1 + packages/site-kit/src/lib/styles/index.css | 2 ++ packages/site-kit/src/lib/styles/tokens.css | 4 ++-- pnpm-lock.yaml | 8 ++++++++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/packages/site-kit/package.json b/packages/site-kit/package.json index 0e35cabd23..e382839bf4 100644 --- a/packages/site-kit/package.json +++ b/packages/site-kit/package.json @@ -22,6 +22,7 @@ "homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/site-kit#readme", "dependencies": { "@fontsource/cardo": "^5.1.0", + "@fontsource/eb-garamond": "^5.1.0", "@fontsource/fira-mono": "^5.1.0", "@fontsource/yantramanav": "^5.1.0", "esm-env": "^1.0.0", diff --git a/packages/site-kit/src/lib/styles/index.css b/packages/site-kit/src/lib/styles/index.css index 8cad27f146..864eff9a52 100644 --- a/packages/site-kit/src/lib/styles/index.css +++ b/packages/site-kit/src/lib/styles/index.css @@ -1,5 +1,7 @@ @import '@fontsource/cardo'; @import '@fontsource/cardo/400-italic.css'; +@import '@fontsource/eb-garamond'; +@import '@fontsource/eb-garamond/400-italic.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 a91381da6a..c80cf6dcda 100644 --- a/packages/site-kit/src/lib/styles/tokens.css +++ b/packages/site-kit/src/lib/styles/tokens.css @@ -24,13 +24,13 @@ /* typography */ --sk-font-heading: 'Yantramanav', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; - --sk-font-body: Cardo, 'Big Caslon', Palatino, 'Book Antiqua', Cambria, serif; + --sk-font-body: 'EB Garamond', 'Big Caslon', Palatino, 'Book Antiqua', Cambria, serif; --sk-font-mono: 'Fira Mono', monospace; --sk-text-xxl: 3.6rem; --sk-text-xl: 3rem; --sk-text-l: 2.4rem; --sk-text-m: 2rem; - --sk-text-s: 1.7rem; + --sk-text-s: 1.8rem; --sk-text-xs: 1.4rem; --sk-line-max-width: 84rem; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b32af47c82..f245eb4d34 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -349,6 +349,9 @@ importers: '@fontsource/cardo': 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 @@ -799,6 +802,9 @@ packages: '@fontsource/cardo@5.1.0': resolution: {integrity: sha512-ylOb2t/CgQV2mNovSVya6r/jC9Q0w3cKHQOO7iycXLHRsgCGF82Oy/Je3GmdoGVKRNF6CDA3pc85Tw1078nQwQ==} + '@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==} @@ -3304,6 +3310,8 @@ snapshots: '@fontsource/cardo@5.1.0': {} + '@fontsource/eb-garamond@5.1.0': {} + '@fontsource/fira-mono@5.1.0': {} '@fontsource/yantramanav@5.1.0': {} From dde9ee9967f70ee156b304134084571db4c0cf82 Mon Sep 17 00:00:00 2001 From: Rich Harris Date: Sun, 29 Sep 2024 13:23:53 -0400 Subject: [PATCH 2/2] remove cardo --- packages/site-kit/package.json | 1 - packages/site-kit/src/lib/styles/index.css | 2 -- pnpm-lock.yaml | 8 -------- 3 files changed, 11 deletions(-) diff --git a/packages/site-kit/package.json b/packages/site-kit/package.json index e382839bf4..534a37e0ea 100644 --- a/packages/site-kit/package.json +++ b/packages/site-kit/package.json @@ -21,7 +21,6 @@ }, "homepage": "https://github.com/sveltejs/svelte.dev/tree/main/packages/site-kit#readme", "dependencies": { - "@fontsource/cardo": "^5.1.0", "@fontsource/eb-garamond": "^5.1.0", "@fontsource/fira-mono": "^5.1.0", "@fontsource/yantramanav": "^5.1.0", diff --git a/packages/site-kit/src/lib/styles/index.css b/packages/site-kit/src/lib/styles/index.css index 864eff9a52..76db2cc1df 100644 --- a/packages/site-kit/src/lib/styles/index.css +++ b/packages/site-kit/src/lib/styles/index.css @@ -1,5 +1,3 @@ -@import '@fontsource/cardo'; -@import '@fontsource/cardo/400-italic.css'; @import '@fontsource/eb-garamond'; @import '@fontsource/eb-garamond/400-italic.css'; @import '@fontsource/fira-mono'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f245eb4d34..12e29ae183 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -346,9 +346,6 @@ importers: packages/site-kit: dependencies: - '@fontsource/cardo': - specifier: ^5.1.0 - version: 5.1.0 '@fontsource/eb-garamond': specifier: ^5.1.0 version: 5.1.0 @@ -799,9 +796,6 @@ packages: cpu: [x64] os: [win32] - '@fontsource/cardo@5.1.0': - resolution: {integrity: sha512-ylOb2t/CgQV2mNovSVya6r/jC9Q0w3cKHQOO7iycXLHRsgCGF82Oy/Je3GmdoGVKRNF6CDA3pc85Tw1078nQwQ==} - '@fontsource/eb-garamond@5.1.0': resolution: {integrity: sha512-FEIWkPgBY9CEhZP1YmA36k/f5Hj4z1Tv2FxIiG8aYHmkKGZNVCVIeO345lCVtpG32ZVQKs8te+JpVtg/GCHXyg==} @@ -3308,8 +3302,6 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@fontsource/cardo@5.1.0': {} - '@fontsource/eb-garamond@5.1.0': {} '@fontsource/fira-mono@5.1.0': {}