From 686367b6e081b647675902ad86dc80f3756da450 Mon Sep 17 00:00:00 2001 From: danidfra Date: Tue, 19 Nov 2024 17:26:05 -0300 Subject: [PATCH] Refactor: remove "Soapbox i18n" font and clean up code --- src/init/soapbox-head.tsx | 14 ++----- src/main.tsx | 2 + src/styles/i18n/arabic.css | 71 ------------------------------------ src/styles/i18n/javanese.css | 39 -------------------- tailwind.config.ts | 7 ++-- 5 files changed, 9 insertions(+), 124 deletions(-) delete mode 100644 src/styles/i18n/arabic.css delete mode 100644 src/styles/i18n/javanese.css diff --git a/src/init/soapbox-head.tsx b/src/init/soapbox-head.tsx index 9c25d0f78..02d3f542a 100644 --- a/src/init/soapbox-head.tsx +++ b/src/init/soapbox-head.tsx @@ -25,14 +25,6 @@ const SoapboxHead: React.FC = ({ children }) => { const themeCss = generateThemeCss(demo ? normalizeSoapboxConfig({ brandColor: '#0482d8' }) : soapboxConfig); const dsn = soapboxConfig.sentryDsn; - const loadLocaleCss = async (locale: string) => { - if (locale === 'ar') { - await import('soapbox/styles/i18n/arabic.css'); - } else if (locale === 'jv') { - await import('soapbox/styles/i18n/javanese.css'); - } - }; - const bodyClass = clsx('h-full bg-white text-base black:bg-black dark:bg-gray-800', { 'no-reduce-motion': !reduceMotion, 'underline-links': underlineLinks, @@ -40,7 +32,6 @@ const SoapboxHead: React.FC = ({ children }) => { }); useEffect(() => { - loadLocaleCss(locale); if (dsn) { startSentry(dsn).catch(console.error); @@ -57,7 +48,10 @@ const SoapboxHead: React.FC = ({ children }) => { {/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */} {['dark', 'black'].includes(theme) && } {/* eslint-disable formatjs/no-literal-string-in-jsx */} - {(locale === 'ar' || locale === 'jv') ? : } + {['ar', 'jv'].includes(locale) ? : } {/* eslint-enable formatjs/no-literal-string-in-jsx */} diff --git a/src/main.tsx b/src/main.tsx index 7a9f1150b..9204d45bd 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -12,6 +12,8 @@ import '@fontsource/inter/500.css'; import '@fontsource/inter/600.css'; import '@fontsource/inter/700.css'; import '@fontsource/inter/900.css'; +import '@fontsource/vazirmatn/arabic.css'; +import '@fontsource/noto-sans-javanese/javanese.css'; import '@fontsource/roboto-mono/400.css'; import 'line-awesome/dist/font-awesome-line-awesome/css/all.css'; import 'soapbox/features/nostr/keyring.ts'; diff --git a/src/styles/i18n/arabic.css b/src/styles/i18n/arabic.css deleted file mode 100644 index 66c634354..000000000 --- a/src/styles/i18n/arabic.css +++ /dev/null @@ -1,71 +0,0 @@ -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 200; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-200-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-200-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 300; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-300-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-300-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 400; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-400-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-400-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 500; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-500-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-500-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 600; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-600-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-600-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 700; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-700-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-700-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 800; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-800-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-800-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} - -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 900; - src: url('@fontsource/vazirmatn/files/vazirmatn-arabic-900-normal.woff2') format('woff2'), url('@fontsource/vazirmatn/files/vazirmatn-arabic-900-normal.woff') format('woff'); - unicode-range: U+0600-06FF, U+0750-077F, U+08A0-08FF, U+FB50-FDFF, U+FE70-FEFF, U+067E, U+0686, U+0698, U+06AF, U+06CC; -} \ No newline at end of file diff --git a/src/styles/i18n/javanese.css b/src/styles/i18n/javanese.css deleted file mode 100644 index 0d00873ad..000000000 --- a/src/styles/i18n/javanese.css +++ /dev/null @@ -1,39 +0,0 @@ -/* noto-sans-javanese-javanese-400-normal */ -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 400; - src: url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-400-normal.woff2) format('woff2'), url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-400-normal.woff) format('woff'); - unicode-range: U+A980-A9DF; -} - -/* noto-sans-javanese-javanese-500-normal */ -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 500; - src: url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-500-normal.woff2) format('woff2'), url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-500-normal.woff) format('woff'); - unicode-range: U+A980-A9DF; -} - -/* noto-sans-javanese-javanese-600-normal */ -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 600; - src: url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-600-normal.woff2) format('woff2'), url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-600-normal.woff) format('woff'); - unicode-range: U+A980-A9DF; -} - -/* noto-sans-javanese-javanese-700-normal */ -@font-face { - font-family: 'Soapbox i18n'; - font-style: normal; - font-display: swap; - font-weight: 700; - src: url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-700-normal.woff2) format('woff2'), url(@fontsource/noto-sans-javanese/files/noto-sans-javanese-javanese-700-normal.woff) format('woff'); - unicode-range: U+A980-A9DF; -} \ No newline at end of file diff --git a/tailwind.config.ts b/tailwind.config.ts index 57bb3709d..977af52b1 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -28,7 +28,6 @@ const config: Config = { }, fontFamily: { sans: [ - 'Soapbox i18n', 'Inter', 'ui-sans-serif', 'system-ui', @@ -95,11 +94,11 @@ const config: Config = { width: '0px', height: '0px', }, - + '29%': { backgroundColor: 'rgb(229, 231, 235)', }, - + '30%': { width: '3rem', height: '3rem', @@ -107,7 +106,7 @@ const config: Config = { opacity: '1', borderWidth: '6px', }, - + '100%': { width: '3rem', height: '3rem',