This commit is contained in:
pa
2026-03-15 21:57:57 +09:00
parent 82339adff3
commit 113b9e6b4a
6 changed files with 26 additions and 27 deletions
+3 -4
View File
@@ -712,13 +712,12 @@
"theme_mode": "Theme", "theme_mode": "Theme",
"font_family": "Font", "font_family": "Font",
"cjk_font_pack": "CJK Font", "cjk_font_pack": "CJK Font",
"font_family_inter": "Inter", "font_family_inter": "Inter (Default)",
"font_family_noto_sans": "Noto Sans", "font_family_noto_sans": "Noto Sans",
"font_family_source_sans_3": "Source Sans 3", "font_family_geist": "Geist",
"font_family_nunito_sans": "Nunito Sans",
"font_family_ibm_plex_sans": "IBM Plex Sans", "font_family_ibm_plex_sans": "IBM Plex Sans",
"font_family_harmonyos_sans": "HarmonyOS Sans",
"font_family_jetbrains_mono": "JetBrains Mono", "font_family_jetbrains_mono": "JetBrains Mono",
"font_family_roboto": "Roboto",
"font_family_fantasque_sans_mono": "Fantasque Sans Mono", "font_family_fantasque_sans_mono": "Fantasque Sans Mono",
"font_family_system_ui": "System Font", "font_family_system_ui": "System Font",
"font_family_custom": "Custom", "font_family_custom": "Custom",
+2 -3
View File
@@ -566,11 +566,10 @@
"font_family": "フォント", "font_family": "フォント",
"font_family_inter": "Inter", "font_family_inter": "Inter",
"font_family_noto_sans": "Noto Sans", "font_family_noto_sans": "Noto Sans",
"font_family_source_sans_3": "Source Sans 3", "font_family_geist": "Geist",
"font_family_nunito_sans": "Nunito Sans",
"font_family_ibm_plex_sans": "IBM Plex Sans", "font_family_ibm_plex_sans": "IBM Plex Sans",
"font_family_harmonyos_sans": "HarmonyOS Sans",
"font_family_jetbrains_mono": "JetBrains Mono", "font_family_jetbrains_mono": "JetBrains Mono",
"font_family_roboto": "Roboto",
"font_family_fantasque_sans_mono": "Fantasque Sans Mono", "font_family_fantasque_sans_mono": "Fantasque Sans Mono",
"font_family_system_ui": "システムフォント", "font_family_system_ui": "システムフォント",
"theme_mode_system": "システムに合わせる", "theme_mode_system": "システムに合わせる",
+2 -3
View File
@@ -565,11 +565,10 @@
"font_family": "字体", "font_family": "字体",
"font_family_inter": "Inter", "font_family_inter": "Inter",
"font_family_noto_sans": "Noto Sans", "font_family_noto_sans": "Noto Sans",
"font_family_source_sans_3": "Source Sans 3", "font_family_geist": "Geist",
"font_family_nunito_sans": "Nunito Sans",
"font_family_ibm_plex_sans": "IBM Plex Sans", "font_family_ibm_plex_sans": "IBM Plex Sans",
"font_family_harmonyos_sans": "HarmonyOS Sans",
"font_family_jetbrains_mono": "JetBrains Mono", "font_family_jetbrains_mono": "JetBrains Mono",
"font_family_roboto": "Roboto",
"font_family_fantasque_sans_mono": "Fantasque Sans Mono", "font_family_fantasque_sans_mono": "Fantasque Sans Mono",
"font_family_system_ui": "跟随系统字体", "font_family_system_ui": "跟随系统字体",
"theme_mode_system": "跟随系统", "theme_mode_system": "跟随系统",
+2 -3
View File
@@ -561,11 +561,10 @@
"font_family": "字型", "font_family": "字型",
"font_family_inter": "Inter", "font_family_inter": "Inter",
"font_family_noto_sans": "Noto Sans", "font_family_noto_sans": "Noto Sans",
"font_family_source_sans_3": "Source Sans 3", "font_family_geist": "Geist",
"font_family_nunito_sans": "Nunito Sans",
"font_family_ibm_plex_sans": "IBM Plex Sans", "font_family_ibm_plex_sans": "IBM Plex Sans",
"font_family_harmonyos_sans": "HarmonyOS Sans",
"font_family_jetbrains_mono": "JetBrains Mono", "font_family_jetbrains_mono": "JetBrains Mono",
"font_family_roboto": "Roboto",
"font_family_fantasque_sans_mono": "Fantasque Sans Mono", "font_family_fantasque_sans_mono": "Fantasque Sans Mono",
"font_family_system_ui": "系統字型", "font_family_system_ui": "系統字型",
"theme_mode_system": "系統", "theme_mode_system": "系統",
+8 -13
View File
@@ -11,31 +11,26 @@ const APP_FONT_CONFIG = Object.freeze({
cssImport: cssImport:
"@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');" "@import url('https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap');"
}, },
source_sans_3: { geist: {
cssName: "'Source Sans 3'", cssName: "'Geist'",
cssImport: cssImport:
"@import url('https://fonts.googleapis.com/css2?family=Source+Sans+3:ital,wght@0,200..900;1,200..900&display=swap');" "@import url('https://fonts.googleapis.com/css2?family=Geist:wght@100..900&display=swap');"
},
nunito_sans: {
cssName: "'Nunito Sans'",
cssImport:
"@import url('https://fonts.googleapis.com/css2?family=Nunito+Sans:ital,opsz,wght@0,6..12,200..1000;1,6..12,200..1000&display=swap');"
}, },
ibm_plex_sans: { ibm_plex_sans: {
cssName: "'IBM Plex Sans'", cssName: "'IBM Plex Sans'",
cssImport: cssImport:
"@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100..700;1,100..700&display=swap');" "@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:ital,wght@0,100..700;1,100..700&display=swap');"
}, },
harmonyos_sans: {
cssName: "'HarmonyOS Sans'",
cssImport:
"@import url('https://fonts.cdnfonts.com/css/harmonyos-sans');"
},
jetbrains_mono: { jetbrains_mono: {
cssName: "'JetBrains Mono'", cssName: "'JetBrains Mono'",
cssImport: cssImport:
"@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap');" "@import url('https://fonts.googleapis.com/css2?family=JetBrains+Mono:ital,wght@0,100..800;1,100..800&display=swap');"
}, },
roboto: {
cssName: "'Roboto'",
cssImport:
"@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100..900;1,100..900&display=swap');"
},
fantasque_sans_mono: { fantasque_sans_mono: {
cssName: "'Fantasque Sans Mono'", cssName: "'Fantasque Sans Mono'",
cssImport: cssImport:
+9 -1
View File
@@ -273,12 +273,20 @@ export const useAppearanceSettingsStore = defineStore(
lastDarkThemeConfig, lastDarkThemeConfig,
fallbackDarkTheme fallbackDarkTheme
); );
appFontFamily.value = normalizeAppFontFamily(appFontFamilyConfig); const normalizedAppFontFamily =
normalizeAppFontFamily(appFontFamilyConfig);
appFontFamily.value = normalizedAppFontFamily;
customFontFamily.value = customFontFamilyConfig || ''; customFontFamily.value = customFontFamilyConfig || '';
appCjkFontPack.value = appCjkFontPack.value =
normalizeAppCjkFontPack(appCjkFontPackConfig); normalizeAppCjkFontPack(appCjkFontPackConfig);
applyAppFontFamily(appFontFamily.value, customFontFamily.value); applyAppFontFamily(appFontFamily.value, customFontFamily.value);
applyAppCjkFontPack(appCjkFontPack.value); applyAppCjkFontPack(appCjkFontPack.value);
if (normalizedAppFontFamily !== appFontFamilyConfig) {
configRepository.setString(
'VRCX_fontFamily',
normalizedAppFontFamily
);
}
displayVRCPlusIconsAsAvatar.value = displayVRCPlusIconsAsAvatar.value =
displayVRCPlusIconsAsAvatarConfig; displayVRCPlusIconsAsAvatarConfig;