From 701c82a843cda36f37636604515f9eccb14451d9 Mon Sep 17 00:00:00 2001 From: Hakadao Date: Sat, 12 Oct 2024 13:08:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20update=20fonts,=20thanks=20to=20[?= =?UTF-8?q?=E8=83=A1=E9=9B=A8=E6=99=B4](https://github.com/hafterain)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/contentScripts/views/necessarySettingsWatchers.ts | 2 +- src/styles/fonts.scss | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/contentScripts/views/necessarySettingsWatchers.ts b/src/contentScripts/views/necessarySettingsWatchers.ts index 2fd2f57f..929f804a 100644 --- a/src/contentScripts/views/necessarySettingsWatchers.ts +++ b/src/contentScripts/views/necessarySettingsWatchers.ts @@ -54,7 +54,7 @@ export function setupNecessarySettingsWatchers() { () => { // Set the default font family if (!settings.value.customizeFont && !settings.value.fontFamily) { - settings.value.fontFamily = `-apple-system, BlinkMacSystemFont, Inter, "SF Pro Text", "Segoe UI Variable Text", "Segoe UI", "Roboto Flex", Roboto, "Noto Sans", Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", Arial, sans-serif` + settings.value.fontFamily = `-apple-system, BlinkMacSystemFont, Inter, "Segoe UI Variable", "Segoe UI", "Roboto Flex", Roboto, "Noto Sans", Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", Arial, sans-serif` } if (settings.value.customizeFont) { diff --git a/src/styles/fonts.scss b/src/styles/fonts.scss index 4df7c923..539216e1 100644 --- a/src/styles/fonts.scss +++ b/src/styles/fonts.scss @@ -1,7 +1,9 @@ +/** font-family 選用字型設定感謝 胡雨晴 hafterain (https://github.com/hafterain) 提供幫助 ❤️❤️❤️ */ + :root, :host { - --bew-fonts-basic: -apple-system, BlinkMacSystemFont, Inter, "SF Pro Text", "Segoe UI Variable Text", "Segoe UI", - "Roboto Flex", Roboto, "Noto Sans", Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue"; + --bew-fonts-basic: -apple-system, BlinkMacSystemFont, Inter, "Segoe UI Variable", "Segoe UI", "Roboto Flex", Roboto, + "Noto Sans", Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue"; --bew-fonts-fallback: system-ui, Arial, sans-serif; --bew-fonts-english: var(--bew-fonts-basic), var(--bew-fonts-fallback);