From 67ba0f6718642dc6a8019dbe5b8157d96976ede3 Mon Sep 17 00:00:00 2001 From: David Ralph Date: Sun, 25 Jan 2026 21:17:38 +0000 Subject: [PATCH] font: replace montserrat with inter --- bun.lock | 6 ++--- package.json | 2 +- src/scss/_variables.scss | 1 + src/scss/index.scss | 53 +++++++++++++++++++++++++++++++++----- src/utils/settings/load.js | 2 +- 5 files changed, 52 insertions(+), 12 deletions(-) diff --git a/bun.lock b/bun.lock index c029e655..36a1b42e 100644 --- a/bun.lock +++ b/bun.lock @@ -9,8 +9,8 @@ "@dnd-kit/utilities": "^3.2.2", "@eartharoid/i18n": "1.2.1", "@floating-ui/react-dom": "2.1.6", + "@fontsource/inter": "^5.2.8", "@fontsource/lexend-deca": "5.0.14", - "@fontsource/montserrat": "5.0.19", "@sentry/react": "^10.36.0", "fast-blurhash": "^1.1.4", "image-conversion": "^2.1.1", @@ -221,9 +221,9 @@ "@floating-ui/utils": ["@floating-ui/utils@0.2.10", "", {}, "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ=="], - "@fontsource/lexend-deca": ["@fontsource/lexend-deca@5.0.14", "", {}, "sha512-rXrfX9UNqykrYYU7wZTYEfcyF+FJWYW9oe4pZWuBMs324EGUXW5kMl1WfSe2D+46o9OS5RyqnAGYs6k/mmmnuQ=="], + "@fontsource/inter": ["@fontsource/inter@5.2.8", "", {}, "sha512-P6r5WnJoKiNVV+zvW2xM13gNdFhAEpQ9dQJHt3naLvfg+LkF2ldgSLiF4T41lf1SQCM9QmkqPTn4TH568IRagg=="], - "@fontsource/montserrat": ["@fontsource/montserrat@5.0.19", "", {}, "sha512-d2JyNIE0i2FOqLFkaSrfsyDzFzkzdER7d3xeHqFOTK5OFE+yiFyvlIBMXg5q+nNpMmVoW+2Q182Csn28o+kijQ=="], + "@fontsource/lexend-deca": ["@fontsource/lexend-deca@5.0.14", "", {}, "sha512-rXrfX9UNqykrYYU7wZTYEfcyF+FJWYW9oe4pZWuBMs324EGUXW5kMl1WfSe2D+46o9OS5RyqnAGYs6k/mmmnuQ=="], "@humanfs/core": ["@humanfs/core@0.19.1", "", {}, "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA=="], diff --git a/package.json b/package.json index f7b6906a..aaaea3d8 100644 --- a/package.json +++ b/package.json @@ -22,8 +22,8 @@ "@dnd-kit/utilities": "^3.2.2", "@eartharoid/i18n": "1.2.1", "@floating-ui/react-dom": "2.1.6", + "@fontsource/inter": "^5.2.8", "@fontsource/lexend-deca": "5.0.14", - "@fontsource/montserrat": "5.0.19", "@sentry/react": "^10.36.0", "fast-blurhash": "^1.1.4", "image-conversion": "^2.1.1", diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss index 785d8005..7b8e2652 100644 --- a/src/scss/_variables.scss +++ b/src/scss/_variables.scss @@ -181,6 +181,7 @@ $theme-map: null; .subtitle { font-size: 16px; + font-family: 'Inter', sans-serif !important; @include themed { color: t($subColor); diff --git a/src/scss/index.scss b/src/scss/index.scss index 4db5bb26..0cec13c1 100644 --- a/src/scss/index.scss +++ b/src/scss/index.scss @@ -10,7 +10,7 @@ body { } * { - font-family: 'Lexend Deca', Montserrat, sans-serif !important; + font-family: 'Lexend Deca', Inter, sans-serif !important; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; outline: none; @@ -91,7 +91,7 @@ body { font-style: normal; font-display: swap; font-weight: 400; - src: url('../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-400-normal.woff2') + src: url(../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-400-normal.woff2) format('woff2'); /* stylelint-disable-next-line unit-no-unknown */ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, @@ -103,7 +103,7 @@ body { font-style: normal; font-display: swap; font-weight: 400; - src: url('../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-ext-400-normal.woff2') + src: url(../../node_modules/@fontsource/lexend-deca/files/lexend-deca-latin-ext-400-normal.woff2) format('woff2'); /* stylelint-disable-next-line unit-no-unknown */ unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, @@ -111,14 +111,53 @@ body { } @font-face { - font-family: Montserrat; + font-family: 'Inter'; + font-style: normal; + font-display: swap; + font-weight: 400; + /* stylelint-disable-next-line unit-no-unknown */ + src: url(../../node_modules/@fontsource/inter/files/inter-latin-400-normal.woff2) format('woff2'); + unicode-range: U+0000-00FF,U+0131,U+0152-0153,U+02BB-02BC,U+02C6,U+02DA,U+02DC,U+0304,U+0308,U+0329,U+2000-206F,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD; +} + +@font-face { + font-family: 'Inter'; font-style: normal; font-display: swap; font-weight: 400; - src: url('../../node_modules/@fontsource/montserrat/files/montserrat-cyrillic-400-normal.woff2') - format('woff2'); /* stylelint-disable-next-line unit-no-unknown */ - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; + src: url(../../node_modules/@fontsource/inter/files/inter-greek-400-normal.woff2) format('woff2'); + unicode-range: U+0370-0377,U+037A-037F,U+0384-038A,U+038C,U+038E-03A1,U+03A3-03FF; +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-display: swap; + font-weight: 400; + /* stylelint-disable-next-line unit-no-unknown */ + src: url(../../node_modules/@fontsource/inter/files/inter-greek-ext-400-normal.woff2) format('woff2'); + unicode-range: U+1F00-1FFF; +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-display: swap; + font-weight: 400; + /* stylelint-disable-next-line unit-no-unknown */ + src: url(../../node_modules/@fontsource/inter/files/inter-vietnamese-400-normal.woff2) format('woff2'); + unicode-range: U+0102-0103,U+0110-0111,U+0128-0129,U+0168-0169,U+01A0-01A1,U+01AF-01B0,U+0300-0301,U+0303-0304,U+0308-0309,U+0323,U+0329,U+1EA0-1EF9,U+20AB; +} + +@font-face { + font-family: 'Inter'; + font-style: normal; + font-display: swap; + font-weight: 400; + /* stylelint-disable-next-line unit-no-unknown */ + src: url(../../node_modules/@fontsource/inter/files/inter-cyrillic-400-normal.woff2) format('woff2'); + unicode-range: U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116; } /* error */ diff --git a/src/utils/settings/load.js b/src/utils/settings/load.js index ccc6fbbf..05a2ecaa 100644 --- a/src/utils/settings/load.js +++ b/src/utils/settings/load.js @@ -93,7 +93,7 @@ export function loadSettings(hotreload) {