From 0b3e7b923d727d91efc8bd923fcf717cba991575 Mon Sep 17 00:00:00 2001 From: kiosion Date: Wed, 8 Nov 2023 11:56:43 -0400 Subject: [PATCH] fix: Use @import for font-families --- svelte-app/src/app.html | 6 ------ .../components/document/content/footer.svelte | 2 +- .../components/document/content/header.svelte | 2 +- .../src/components/lists/list-item.svelte | 2 +- .../portable-text/portable-text.svelte | 2 +- .../serializers/custom-heading.svelte | 2 +- svelte-app/src/styles/_fonts.scss | 10 +-------- svelte-app/tailwind.config.cjs | 21 ++----------------- 8 files changed, 8 insertions(+), 39 deletions(-) diff --git a/svelte-app/src/app.html b/svelte-app/src/app.html index 37a463089..7b509744b 100644 --- a/svelte-app/src/app.html +++ b/svelte-app/src/app.html @@ -11,12 +11,6 @@ %sveltekit.head% - - -
diff --git a/svelte-app/src/components/document/content/footer.svelte b/svelte-app/src/components/document/content/footer.svelte index 313e2553a..5ff08421e 100644 --- a/svelte-app/src/components/document/content/footer.svelte +++ b/svelte-app/src/components/document/content/footer.svelte @@ -15,7 +15,7 @@ {#if data._type === 'project' && data.github}
-

{$t('Links')}

+

{$t('Links')}

diff --git a/svelte-app/src/components/document/content/header.svelte b/svelte-app/src/components/document/content/header.svelte index 81e50c241..051cdf5d2 100644 --- a/svelte-app/src/components/document/content/header.svelte +++ b/svelte-app/src/components/document/content/header.svelte @@ -103,7 +103,7 @@ @import '@styles/mixins'; h1 { - @apply mb-4 mt-10 h-fit max-w-full font-display text-4xl font-bold text-black transition-[color]; + @apply mb-4 mt-10 h-fit max-w-full text-4xl font-bold text-black transition-[color]; overflow-wrap: break-word; word-break: break-word; diff --git a/svelte-app/src/components/lists/list-item.svelte b/svelte-app/src/components/lists/list-item.svelte index 940a2391b..8dae3a01a 100644 --- a/svelte-app/src/components/lists/list-item.svelte +++ b/svelte-app/src/components/lists/list-item.svelte @@ -48,7 +48,7 @@

{#if footnotes?.length}
-

+

{$t('Footnotes')}

    diff --git a/svelte-app/src/components/portable-text/serializers/custom-heading.svelte b/svelte-app/src/components/portable-text/serializers/custom-heading.svelte index b364f2c99..cedbf98f8 100644 --- a/svelte-app/src/components/portable-text/serializers/custom-heading.svelte +++ b/svelte-app/src/components/portable-text/serializers/custom-heading.svelte @@ -45,7 +45,7 @@ h4, h5, h6 { - @apply inline font-display font-bold text-black transition-[color]; + @apply inline font-bold text-black transition-[color]; } &.h1 { diff --git a/svelte-app/src/styles/_fonts.scss b/svelte-app/src/styles/_fonts.scss index 2a8827930..adc96ff6f 100644 --- a/svelte-app/src/styles/_fonts.scss +++ b/svelte-app/src/styles/_fonts.scss @@ -1,9 +1 @@ -.comicSans { - .font-display, - .font-code, - .font-sans, - .font-mono { - font-family: 'Comic Neue', sans-serif !important; - font-weight: 700; - } -} +@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700&family=Ubuntu+Mono:wght@400;700&family=Work+Sans&display=swap'); diff --git a/svelte-app/tailwind.config.cjs b/svelte-app/tailwind.config.cjs index ad0d42c32..3bdd8d093 100644 --- a/svelte-app/tailwind.config.cjs +++ b/svelte-app/tailwind.config.cjs @@ -19,34 +19,17 @@ module.exports = { fontFamily: { sans: ['Roboto', ...defaultTheme.fontFamily.sans], mono: ['Work Sans', ...defaultTheme.fontFamily.mono], - code: ['Ubuntu Mono', ...defaultTheme.fontFamily.mono], - display: ['Roboto', ...defaultTheme.fontFamily.sans] + code: ['Ubuntu Mono', ...defaultTheme.fontFamily.mono] }, fontSize: { 'xs': ['0.75rem', '1'], '4xl': ['2.25rem', '1.15'], '5xl': ['2.25rem', '1.15'], - '6xl': ['3rem', '1.15'], - '7xl': ['3.5rem', '1.15'], - '8xl': ['4.5rem', '1.15'] + '6xl': ['3rem', '1.15'] }, borderRadius: { sm: '0.2rem' }, - keyframes: { - wave: { - to: { - 'margin-left': '-51%' - } - } - }, - background: { - 'radial-light': 'radial-gradient(#e2e8f0, transparent 25%)', - 'radial-dark': 'radial-gradient(#0f172a, transparent 25%)' - }, - animation: { - wave: 'wave 1.5s linear infinite' - }, screens: { '3xl': '1824px' }