diff --git a/bun.lockb b/bun.lockb index fbd55445..01870d51 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index f5e03c45..f5b55898 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "@dicebear/core": "^6.0.4", "@dicebear/initials": "^6.0.4", "markdown-it": "^13.0.1", - "mono-svelte": "1.5.6" + "mono-svelte": "1.5.8" }, "overrides": { "@rollup/plugin-node-resolve": "^15.2.3", diff --git a/src/lib/components/lemmy/post/PostMeta.svelte b/src/lib/components/lemmy/post/PostMeta.svelte index 30f09732..ea6c60de 100644 --- a/src/lib/components/lemmy/post/PostMeta.svelte +++ b/src/lib/components/lemmy/post/PostMeta.svelte @@ -150,7 +150,9 @@ {#if title && id} diff --git a/src/lib/settings.ts b/src/lib/settings.ts index 9f4be7f0..3d931469 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -66,7 +66,7 @@ interface Settings { debugInfo: boolean expandImages: boolean - font: 'inter' | 'system' | 'browser' + font: 'inter' | 'satoshi/nunito' | 'system' | 'browser' leftAlign: boolean hidePhoton: boolean diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index a7ef05da..1eacb3fa 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -101,7 +101,9 @@ ? 'font-inter' : $userSettings.font == 'system' ? 'font-system' - : 'font-sans'}" + : $userSettings.font == 'satoshi/nunito' + ? 'font-nunito' + : 'font-sans'}" route={$page.route} > diff --git a/src/routes/post/[instance]/[id=integer]/+page.svelte b/src/routes/post/[instance]/[id=integer]/+page.svelte index b8d6e5ce..0b872cbf 100644 --- a/src/routes/post/[instance]/[id=integer]/+page.svelte +++ b/src/routes/post/[instance]/[id=integer]/+page.svelte @@ -208,7 +208,7 @@ -

+

Font What font Photon should use. diff --git a/src/style/app.css b/src/style/app.css index 8904149f..faec52bb 100644 --- a/src/style/app.css +++ b/src/style/app.css @@ -24,6 +24,18 @@ font-display: swap; } +@font-face { + font-family: 'Satoshi'; + src: url('/font/Satoshi.woff2') format('woff2'); + font-display: swap; +} + +@font-face { + font-family: 'Nunito'; + src: url('/font/Nunito.woff2') format('woff2'); + font-display: swap; +} + body { @apply bg-slate-50 text-slate-900 dark:bg-zinc-950 dark:text-zinc-100 accent-slate-950 dark:accent-zinc-50; } diff --git a/static/font/Nunito.woff2 b/static/font/Nunito.woff2 new file mode 100644 index 00000000..925ddd7e Binary files /dev/null and b/static/font/Nunito.woff2 differ diff --git a/static/font/Satoshi.woff2 b/static/font/Satoshi.woff2 new file mode 100644 index 00000000..b00e833e Binary files /dev/null and b/static/font/Satoshi.woff2 differ diff --git a/tailwind.config.js b/tailwind.config.js index e014aeff..a96a3c6c 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -13,6 +13,8 @@ export default { system: ['system-ui'], serif: ['serif'], inter: ['Inter', 'system-ui', 'sans-serif'], + nunito: ['Nunito', 'system-ui', 'sans-serif'], + display: ['Satoshi', 'system-ui', 'sans-serif'] }, extend: { animation: {