From 2e0b423057d5f0e48c8234627bd6c47fadde0b3e Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 2 May 2026 08:36:03 +0000 Subject: [PATCH] fix(frontend): harden font/theme preferences for production edge cases Edge-case review identified several issues that would degrade UX or silently break under unusual conditions: - Anon settings chosen on the login screen were lost on first login because the storage namespace switched from "anon" to the user id; resolveStorageValue now falls through user -> anon -> legacy, so pre-login choices carry over and v1 unscoped keys are still picked up. - localStorage.setItem can throw under quota / private mode; setters now swallow the error so the UI still updates for the session. - applyFont reduced to String(undefined) when currentSize held an invalid value; runtime fallbacks to the default scale guard against manipulated storage. - Added var(--app-font-scale, 1) defaults to all 32 calc() expressions in theme.css and the body font-size, so a missing variable cannot void the calc() value. - Validation guards in setSansFont / setMonoFont / setFontSize / setTheme reject invalid keys instead of writing them to storage. - GeneralSettings.vue now watches the composable refs so the form stays in sync if preferences change externally (e.g. user switch while on the page). - Dropped the unverified t-radio-group variant prop in favour of the default style. https://claude.ai/code/session_01S1FVPf4jRfWXkTSnpMmMp7 --- frontend/src/App.vue | 2 +- frontend/src/assets/theme/theme.css | 4 +- frontend/src/composables/useFont.ts | 58 ++++++++++++++++--- frontend/src/composables/useTheme.ts | 42 ++++++++++++-- .../src/views/settings/GeneralSettings.vue | 9 ++- 5 files changed, 97 insertions(+), 18 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 36657c76..5f566200 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -192,7 +192,7 @@ html, height: 100%; margin: 0; padding: 0; - font-size: calc(14px * var(--app-font-scale)); + font-size: calc(14px * var(--app-font-scale, 1)); font-family: var(--app-font-family); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; diff --git a/frontend/src/assets/theme/theme.css b/frontend/src/assets/theme/theme.css index 8d540657..1ed5a70e 100644 --- a/frontend/src/assets/theme/theme.css +++ b/frontend/src/assets/theme/theme.css @@ -1,4 +1,4 @@ -:root,:root[theme-mode="light"]{ --app-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif; --app-font-family-mono: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --app-font-scale: 1; --brand-main: var(--td-brand-color-4); --td-brand-color-light: var(--td-brand-color-1); --td-brand-color-focus: var(--td-brand-color-2); --td-brand-color-disabled: var(--td-brand-color-3); --td-brand-color-hover: var(--td-brand-color-3); --td-brand-color: var(--td-brand-color-4); --td-brand-color-active:var(--td-brand-color-5); --td-brand-color-1: #e9f8ec; --td-brand-color-2: #09f479; --td-brand-color-3: #08dd6e; --td-brand-color-4: #07c05f; --td-brand-color-5: #06b04d; --td-brand-color-6: #049b38; --td-brand-color-7: #038626; --td-brand-color-8: #027218; --td-brand-color-9: #015e0d; --td-brand-color-10: #004b05; --td-warning-color-1: #fef3e6;--td-warning-color-2: #f9e0c7;--td-warning-color-3: #f7c797;--td-warning-color-4: #f2995f;--td-warning-color-5: #ed7b2f;--td-warning-color-6: #d35a21;--td-warning-color-7: #ba431b;--td-warning-color-8: #9e3610;--td-warning-color-9: #842b0b;--td-warning-color-10: #5a1907;--td-warning-color: var(--td-warning-color-5);--td-warning-color-hover: var(--td-warning-color-4);--td-warning-color-focus: var(--td-warning-color-2);--td-warning-color-active: var(--td-warning-color-6);--td-warning-color-disabled: var(--td-warning-color-3);--td-warning-color-light: var(--td-warning-color-1); --td-error-color-1: #fdecee;--td-error-color-2: #f9d7d9;--td-error-color-3: #f8b9be;--td-error-color-4: #f78d94;--td-error-color-5: #f36d78;--td-error-color-6: #e34d59;--td-error-color-7: #c9353f;--td-error-color-8: #b11f26;--td-error-color-9: #951114;--td-error-color-10: #680506;--td-error-color: var(--td-error-color-6);--td-error-color-hover: var(--td-error-color-5);--td-error-color-focus: var(--td-error-color-2);--td-error-color-active: var(--td-error-color-7);--td-error-color-disabled: var(--td-error-color-3);--td-error-color-light: var(--td-error-color-1); --td-success-color-1: #e8f8f2;--td-success-color-2: #bcebdc;--td-success-color-3: #85dbbe;--td-success-color-4: #48c79c;--td-success-color-5: #00a870;--td-success-color-6: #078d5c;--td-success-color-7: #067945;--td-success-color-8: #056334;--td-success-color-9: #044f2a;--td-success-color-10: #033017;--td-success-color: var(--td-success-color-5);--td-success-color-hover: var(--td-success-color-4);--td-success-color-focus: var(--td-success-color-2);--td-success-color-active: var(--td-success-color-6);--td-success-color-disabled: var(--td-success-color-3);--td-success-color-light: var(--td-success-color-1); --td-gray-color-1: #f3f3f3;--td-gray-color-2: #eee;--td-gray-color-3: #e7e7e7;--td-gray-color-4: #dcdcdc;--td-gray-color-5: #c5c5c5;--td-gray-color-6: #a6a6a6;--td-gray-color-7: #8b8b8b;--td-gray-color-8: #777;--td-gray-color-9: #5e5e5e;--td-gray-color-10: #4b4b4b;--td-gray-color-11: #383838;--td-gray-color-12: #2c2c2c;--td-gray-color-13: #242424;--td-gray-color-14: #181818;--td-bg-color-container: #fff;--td-bg-color-container-select: #fff;--td-bg-color-page: var(--td-gray-color-2);--td-bg-color-sidebar: #f9f9f9;--td-bg-color-settings-modal: #f9f9f9;--td-bg-color-container-hover: var(--td-gray-color-1);--td-bg-color-container-active: var(--td-gray-color-3);--td-bg-color-secondarycontainer: var(--td-gray-color-1);--td-bg-color-secondarycontainer-hover: var(--td-gray-color-2);--td-bg-color-secondarycontainer-active: var(--td-gray-color-4);--td-bg-color-component: var(--td-gray-color-3);--td-bg-color-component-hover: var(--td-gray-color-4);--td-bg-color-component-active: var(--td-gray-color-6);--td-bg-color-component-disabled: var(--td-gray-color-2);--td-component-stroke: var(--td-gray-color-3);--td-component-border: var(--td-gray-color-4); --td-font-white-1: #ffffff;--td-font-white-2: rgba(255, 255, 255, 0.55);--td-font-white-3: rgba(255, 255, 255, 0.35);--td-font-white-4: rgba(255, 255, 255, 0.22);--td-font-gray-1: rgba(0, 0, 0, 0.9);--td-font-gray-2: rgba(0, 0, 0, 0.6);--td-font-gray-3: rgba(0, 0, 0, 0.4);--td-font-gray-4: rgba(0, 0, 0, 0.26);--td-text-color-primary: var(--td-font-gray-1);--td-text-color-secondary: var(--td-font-gray-2);--td-text-color-placeholder: var(--td-font-gray-3);--td-text-color-disabled: var(--td-font-gray-4);--td-text-color-anti: #fff;--td-text-color-brand: var(--td-brand-color);--td-text-color-link: var(--td-brand-color); /* 字体配置 */ --td-font-family: var(--app-font-family); --td-font-family-medium: var(--app-font-family); --td-font-size-link-small: calc(12px * var(--app-font-scale)); --td-font-size-link-medium: calc(14px * var(--app-font-scale)); --td-font-size-link-large: calc(16px * var(--app-font-scale)); --td-font-size-mark-small: calc(12px * var(--app-font-scale)); --td-font-size-mark-medium: calc(14px * var(--app-font-scale)); --td-font-size-body-small: calc(12px * var(--app-font-scale)); --td-font-size-body-medium: calc(14px * var(--app-font-scale)); --td-font-size-body-large: calc(16px * var(--app-font-scale)); --td-font-size-title-small: calc(14px * var(--app-font-scale)); --td-font-size-title-medium: calc(16px * var(--app-font-scale)); --td-font-size-title-large: calc(20px * var(--app-font-scale)); --td-font-size-headline-small: calc(24px * var(--app-font-scale)); --td-font-size-headline-medium: calc(28px * var(--app-font-scale)); --td-font-size-headline-large: calc(36px * var(--app-font-scale)); --td-font-size-display-medium: calc(48px * var(--app-font-scale)); --td-font-size-display-large: calc(64px * var(--app-font-scale)); --td-line-height-common: 8px; --td-line-height-link-small: calc( var(--td-font-size-link-small) + var(--td-line-height-common) ); --td-line-height-link-medium: calc( var(--td-font-size-link-medium) + var(--td-line-height-common) ); --td-line-height-link-large: calc( var(--td-font-size-link-large) + var(--td-line-height-common) ); --td-line-height-mark-small: calc( var(--td-font-size-mark-small) + var(--td-line-height-common) ); --td-line-height-mark-medium: calc( var(--td-font-size-mark-medium) + var(--td-line-height-common) ); --td-line-height-body-small: calc( var(--td-font-size-body-small) + var(--td-line-height-common) ); --td-line-height-body-medium: calc( var(--td-font-size-body-medium) + var(--td-line-height-common) ); --td-line-height-body-large: calc( var(--td-font-size-body-large) + var(--td-line-height-common) ); --td-line-height-title-small: calc( var(--td-font-size-title-small) + var(--td-line-height-common) ); --td-line-height-title-medium: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-title-large: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-headline-small: calc( var(--td-font-size-headline-small) + var(--td-line-height-common) ); --td-line-height-headline-medium: calc( var(--td-font-size-headline-medium) + var(--td-line-height-common) ); --td-line-height-headline-large: calc( var(--td-font-size-headline-large) + var(--td-line-height-common) ); --td-line-height-display-medium: calc( var(--td-font-size-display-medium) + var(--td-line-height-common) ); --td-line-height-display-large: calc( var(--td-font-size-display-large) + var(--td-line-height-common) ); --td-font-link-small: var(--td-font-size-link-small) / var(--td-line-height-link-small) var(--td-font-family); --td-font-link-medium: var(--td-font-size-link-medium) / var(--td-line-height-link-medium) var(--td-font-family); --td-font-link-large: var(--td-font-size-link-large) / var(--td-line-height-link-large) var(--td-font-family); --td-font-mark-small: 600 var(--td-font-size-mark-small) / var(--td-line-height-mark-small) var(--td-font-family); --td-font-mark-medium: 600 var(--td-font-size-mark-medium) / var(--td-line-height-mark-medium) var(--td-font-family); --td-font-body-small: var(--td-font-size-body-small) / var(--td-line-height-body-small) var(--td-font-family); --td-font-body-medium: var(--td-font-size-body-medium) / var(--td-line-height-body-medium) var(--td-font-family); --td-font-body-large: var(--td-font-size-body-large) / var(--td-line-height-body-large) var(--td-font-family); --td-font-title-small: var(--td-font-size-title-small) / var(--td-line-height-title-small) var(--td-font-family); --td-font-title-medium: var(--td-font-size-title-medium) / var(--td-line-height-title-medium) var(--td-font-family); --td-font-title-large: var(--td-font-size-title-large) / var(--td-line-height-title-large) var(--td-font-family); --td-font-headline-small: var(--td-font-size-headline-small) / var(--td-line-height-headline-small) var(--td-font-family); --td-font-headline-medium: var(--td-font-size-headline-medium) / var(--td-line-height-headline-medium) var(--td-font-family); --td-font-headline-large: var(--td-font-size-headline-large) / var(--td-line-height-headline-large) var(--td-font-family); --td-font-display-medium: var(--td-font-size-display-medium) / var(--td-line-height-display-medium) var(--td-font-family); --td-font-display-large: var(--td-font-size-display-large) / var(--td-line-height-display-large) var(--td-font-family); /* 字体颜色 */ --td-text-color-primary: var(--td-font-gray-1); --td-text-color-secondary: var(--td-font-gray-2); --td-text-color-placeholder: var(--td-font-gray-3); --td-text-color-disabled: var(--td-font-gray-4); --td-text-color-anti: #fff; --td-text-color-brand: var(--td-brand-color); --td-text-color-link: var(--td-brand-color); /* end 字体配置 */ /* 圆角配置 */ --td-radius-small: 2px; --td-radius-default: 3px; --td-radius-medium: 6px; --td-radius-large: 9px; --td-radius-extraLarge: 12px; --td-radius-round: 999px; --td-radius-circle: 50%; /* end 圆角配置 */ /* 阴影配置 */ --td-shadow-1: 0px 1px 10px rgba(0, 0, 0, 0.05), 0px 4px 5px rgba(0, 0, 0, 0.08), 0px 2px 4px -1px rgba(0, 0, 0, 0.12); --td-shadow-2: 0px 3px 14px 2px rgba(0, 0, 0, 0.05), 0px 8px 10px 1px rgba(0, 0, 0, 0.06), 0px 5px 5px -3px rgba(0, 0, 0, 0.1); --td-shadow-3: 0px 6px 30px 5px rgba(0, 0, 0, 0.05), 0px 16px 24px 2px rgba(0, 0, 0, 0.04), 0px 8px 10px -5px rgba(0, 0, 0, 0.08); /* end 阴影配置 */ } +:root,:root[theme-mode="light"]{ --app-font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", sans-serif; --app-font-family-mono: ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; --app-font-scale: 1; --brand-main: var(--td-brand-color-4); --td-brand-color-light: var(--td-brand-color-1); --td-brand-color-focus: var(--td-brand-color-2); --td-brand-color-disabled: var(--td-brand-color-3); --td-brand-color-hover: var(--td-brand-color-3); --td-brand-color: var(--td-brand-color-4); --td-brand-color-active:var(--td-brand-color-5); --td-brand-color-1: #e9f8ec; --td-brand-color-2: #09f479; --td-brand-color-3: #08dd6e; --td-brand-color-4: #07c05f; --td-brand-color-5: #06b04d; --td-brand-color-6: #049b38; --td-brand-color-7: #038626; --td-brand-color-8: #027218; --td-brand-color-9: #015e0d; --td-brand-color-10: #004b05; --td-warning-color-1: #fef3e6;--td-warning-color-2: #f9e0c7;--td-warning-color-3: #f7c797;--td-warning-color-4: #f2995f;--td-warning-color-5: #ed7b2f;--td-warning-color-6: #d35a21;--td-warning-color-7: #ba431b;--td-warning-color-8: #9e3610;--td-warning-color-9: #842b0b;--td-warning-color-10: #5a1907;--td-warning-color: var(--td-warning-color-5);--td-warning-color-hover: var(--td-warning-color-4);--td-warning-color-focus: var(--td-warning-color-2);--td-warning-color-active: var(--td-warning-color-6);--td-warning-color-disabled: var(--td-warning-color-3);--td-warning-color-light: var(--td-warning-color-1); --td-error-color-1: #fdecee;--td-error-color-2: #f9d7d9;--td-error-color-3: #f8b9be;--td-error-color-4: #f78d94;--td-error-color-5: #f36d78;--td-error-color-6: #e34d59;--td-error-color-7: #c9353f;--td-error-color-8: #b11f26;--td-error-color-9: #951114;--td-error-color-10: #680506;--td-error-color: var(--td-error-color-6);--td-error-color-hover: var(--td-error-color-5);--td-error-color-focus: var(--td-error-color-2);--td-error-color-active: var(--td-error-color-7);--td-error-color-disabled: var(--td-error-color-3);--td-error-color-light: var(--td-error-color-1); --td-success-color-1: #e8f8f2;--td-success-color-2: #bcebdc;--td-success-color-3: #85dbbe;--td-success-color-4: #48c79c;--td-success-color-5: #00a870;--td-success-color-6: #078d5c;--td-success-color-7: #067945;--td-success-color-8: #056334;--td-success-color-9: #044f2a;--td-success-color-10: #033017;--td-success-color: var(--td-success-color-5);--td-success-color-hover: var(--td-success-color-4);--td-success-color-focus: var(--td-success-color-2);--td-success-color-active: var(--td-success-color-6);--td-success-color-disabled: var(--td-success-color-3);--td-success-color-light: var(--td-success-color-1); --td-gray-color-1: #f3f3f3;--td-gray-color-2: #eee;--td-gray-color-3: #e7e7e7;--td-gray-color-4: #dcdcdc;--td-gray-color-5: #c5c5c5;--td-gray-color-6: #a6a6a6;--td-gray-color-7: #8b8b8b;--td-gray-color-8: #777;--td-gray-color-9: #5e5e5e;--td-gray-color-10: #4b4b4b;--td-gray-color-11: #383838;--td-gray-color-12: #2c2c2c;--td-gray-color-13: #242424;--td-gray-color-14: #181818;--td-bg-color-container: #fff;--td-bg-color-container-select: #fff;--td-bg-color-page: var(--td-gray-color-2);--td-bg-color-sidebar: #f9f9f9;--td-bg-color-settings-modal: #f9f9f9;--td-bg-color-container-hover: var(--td-gray-color-1);--td-bg-color-container-active: var(--td-gray-color-3);--td-bg-color-secondarycontainer: var(--td-gray-color-1);--td-bg-color-secondarycontainer-hover: var(--td-gray-color-2);--td-bg-color-secondarycontainer-active: var(--td-gray-color-4);--td-bg-color-component: var(--td-gray-color-3);--td-bg-color-component-hover: var(--td-gray-color-4);--td-bg-color-component-active: var(--td-gray-color-6);--td-bg-color-component-disabled: var(--td-gray-color-2);--td-component-stroke: var(--td-gray-color-3);--td-component-border: var(--td-gray-color-4); --td-font-white-1: #ffffff;--td-font-white-2: rgba(255, 255, 255, 0.55);--td-font-white-3: rgba(255, 255, 255, 0.35);--td-font-white-4: rgba(255, 255, 255, 0.22);--td-font-gray-1: rgba(0, 0, 0, 0.9);--td-font-gray-2: rgba(0, 0, 0, 0.6);--td-font-gray-3: rgba(0, 0, 0, 0.4);--td-font-gray-4: rgba(0, 0, 0, 0.26);--td-text-color-primary: var(--td-font-gray-1);--td-text-color-secondary: var(--td-font-gray-2);--td-text-color-placeholder: var(--td-font-gray-3);--td-text-color-disabled: var(--td-font-gray-4);--td-text-color-anti: #fff;--td-text-color-brand: var(--td-brand-color);--td-text-color-link: var(--td-brand-color); /* 字体配置 */ --td-font-family: var(--app-font-family); --td-font-family-medium: var(--app-font-family); --td-font-size-link-small: calc(12px * var(--app-font-scale, 1)); --td-font-size-link-medium: calc(14px * var(--app-font-scale, 1)); --td-font-size-link-large: calc(16px * var(--app-font-scale, 1)); --td-font-size-mark-small: calc(12px * var(--app-font-scale, 1)); --td-font-size-mark-medium: calc(14px * var(--app-font-scale, 1)); --td-font-size-body-small: calc(12px * var(--app-font-scale, 1)); --td-font-size-body-medium: calc(14px * var(--app-font-scale, 1)); --td-font-size-body-large: calc(16px * var(--app-font-scale, 1)); --td-font-size-title-small: calc(14px * var(--app-font-scale, 1)); --td-font-size-title-medium: calc(16px * var(--app-font-scale, 1)); --td-font-size-title-large: calc(20px * var(--app-font-scale, 1)); --td-font-size-headline-small: calc(24px * var(--app-font-scale, 1)); --td-font-size-headline-medium: calc(28px * var(--app-font-scale, 1)); --td-font-size-headline-large: calc(36px * var(--app-font-scale, 1)); --td-font-size-display-medium: calc(48px * var(--app-font-scale, 1)); --td-font-size-display-large: calc(64px * var(--app-font-scale, 1)); --td-line-height-common: 8px; --td-line-height-link-small: calc( var(--td-font-size-link-small) + var(--td-line-height-common) ); --td-line-height-link-medium: calc( var(--td-font-size-link-medium) + var(--td-line-height-common) ); --td-line-height-link-large: calc( var(--td-font-size-link-large) + var(--td-line-height-common) ); --td-line-height-mark-small: calc( var(--td-font-size-mark-small) + var(--td-line-height-common) ); --td-line-height-mark-medium: calc( var(--td-font-size-mark-medium) + var(--td-line-height-common) ); --td-line-height-body-small: calc( var(--td-font-size-body-small) + var(--td-line-height-common) ); --td-line-height-body-medium: calc( var(--td-font-size-body-medium) + var(--td-line-height-common) ); --td-line-height-body-large: calc( var(--td-font-size-body-large) + var(--td-line-height-common) ); --td-line-height-title-small: calc( var(--td-font-size-title-small) + var(--td-line-height-common) ); --td-line-height-title-medium: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-title-large: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-headline-small: calc( var(--td-font-size-headline-small) + var(--td-line-height-common) ); --td-line-height-headline-medium: calc( var(--td-font-size-headline-medium) + var(--td-line-height-common) ); --td-line-height-headline-large: calc( var(--td-font-size-headline-large) + var(--td-line-height-common) ); --td-line-height-display-medium: calc( var(--td-font-size-display-medium) + var(--td-line-height-common) ); --td-line-height-display-large: calc( var(--td-font-size-display-large) + var(--td-line-height-common) ); --td-font-link-small: var(--td-font-size-link-small) / var(--td-line-height-link-small) var(--td-font-family); --td-font-link-medium: var(--td-font-size-link-medium) / var(--td-line-height-link-medium) var(--td-font-family); --td-font-link-large: var(--td-font-size-link-large) / var(--td-line-height-link-large) var(--td-font-family); --td-font-mark-small: 600 var(--td-font-size-mark-small) / var(--td-line-height-mark-small) var(--td-font-family); --td-font-mark-medium: 600 var(--td-font-size-mark-medium) / var(--td-line-height-mark-medium) var(--td-font-family); --td-font-body-small: var(--td-font-size-body-small) / var(--td-line-height-body-small) var(--td-font-family); --td-font-body-medium: var(--td-font-size-body-medium) / var(--td-line-height-body-medium) var(--td-font-family); --td-font-body-large: var(--td-font-size-body-large) / var(--td-line-height-body-large) var(--td-font-family); --td-font-title-small: var(--td-font-size-title-small) / var(--td-line-height-title-small) var(--td-font-family); --td-font-title-medium: var(--td-font-size-title-medium) / var(--td-line-height-title-medium) var(--td-font-family); --td-font-title-large: var(--td-font-size-title-large) / var(--td-line-height-title-large) var(--td-font-family); --td-font-headline-small: var(--td-font-size-headline-small) / var(--td-line-height-headline-small) var(--td-font-family); --td-font-headline-medium: var(--td-font-size-headline-medium) / var(--td-line-height-headline-medium) var(--td-font-family); --td-font-headline-large: var(--td-font-size-headline-large) / var(--td-line-height-headline-large) var(--td-font-family); --td-font-display-medium: var(--td-font-size-display-medium) / var(--td-line-height-display-medium) var(--td-font-family); --td-font-display-large: var(--td-font-size-display-large) / var(--td-line-height-display-large) var(--td-font-family); /* 字体颜色 */ --td-text-color-primary: var(--td-font-gray-1); --td-text-color-secondary: var(--td-font-gray-2); --td-text-color-placeholder: var(--td-font-gray-3); --td-text-color-disabled: var(--td-font-gray-4); --td-text-color-anti: #fff; --td-text-color-brand: var(--td-brand-color); --td-text-color-link: var(--td-brand-color); /* end 字体配置 */ /* 圆角配置 */ --td-radius-small: 2px; --td-radius-default: 3px; --td-radius-medium: 6px; --td-radius-large: 9px; --td-radius-extraLarge: 12px; --td-radius-round: 999px; --td-radius-circle: 50%; /* end 圆角配置 */ /* 阴影配置 */ --td-shadow-1: 0px 1px 10px rgba(0, 0, 0, 0.05), 0px 4px 5px rgba(0, 0, 0, 0.08), 0px 2px 4px -1px rgba(0, 0, 0, 0.12); --td-shadow-2: 0px 3px 14px 2px rgba(0, 0, 0, 0.05), 0px 8px 10px 1px rgba(0, 0, 0, 0.06), 0px 5px 5px -3px rgba(0, 0, 0, 0.1); --td-shadow-3: 0px 6px 30px 5px rgba(0, 0, 0, 0.05), 0px 16px 24px 2px rgba(0, 0, 0, 0.04), 0px 8px 10px -5px rgba(0, 0, 0, 0.08); /* end 阴影配置 */ } :root[theme-mode="dark"]{ --brand-main: var(--td-brand-color-6); --td-brand-color-light: var(--td-brand-color-1); @@ -89,7 +89,7 @@ --td-text-color-brand: var(--td-brand-color); --td-text-color-link: var(--td-brand-color); - /* 字体配置 */ --td-font-family: var(--app-font-family); --td-font-family-medium: var(--app-font-family); --td-font-size-link-small: calc(12px * var(--app-font-scale)); --td-font-size-link-medium: calc(14px * var(--app-font-scale)); --td-font-size-link-large: calc(16px * var(--app-font-scale)); --td-font-size-mark-small: calc(12px * var(--app-font-scale)); --td-font-size-mark-medium: calc(14px * var(--app-font-scale)); --td-font-size-body-small: calc(12px * var(--app-font-scale)); --td-font-size-body-medium: calc(14px * var(--app-font-scale)); --td-font-size-body-large: calc(16px * var(--app-font-scale)); --td-font-size-title-small: calc(14px * var(--app-font-scale)); --td-font-size-title-medium: calc(16px * var(--app-font-scale)); --td-font-size-title-large: calc(20px * var(--app-font-scale)); --td-font-size-headline-small: calc(24px * var(--app-font-scale)); --td-font-size-headline-medium: calc(28px * var(--app-font-scale)); --td-font-size-headline-large: calc(36px * var(--app-font-scale)); --td-font-size-display-medium: calc(48px * var(--app-font-scale)); --td-font-size-display-large: calc(64px * var(--app-font-scale)); --td-line-height-common: 8px; --td-line-height-link-small: calc( var(--td-font-size-link-small) + var(--td-line-height-common) ); --td-line-height-link-medium: calc( var(--td-font-size-link-medium) + var(--td-line-height-common) ); --td-line-height-link-large: calc( var(--td-font-size-link-large) + var(--td-line-height-common) ); --td-line-height-mark-small: calc( var(--td-font-size-mark-small) + var(--td-line-height-common) ); --td-line-height-mark-medium: calc( var(--td-font-size-mark-medium) + var(--td-line-height-common) ); --td-line-height-body-small: calc( var(--td-font-size-body-small) + var(--td-line-height-common) ); --td-line-height-body-medium: calc( var(--td-font-size-body-medium) + var(--td-line-height-common) ); --td-line-height-body-large: calc( var(--td-font-size-body-large) + var(--td-line-height-common) ); --td-line-height-title-small: calc( var(--td-font-size-title-small) + var(--td-line-height-common) ); --td-line-height-title-medium: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-title-large: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-headline-small: calc( var(--td-font-size-headline-small) + var(--td-line-height-common) ); --td-line-height-headline-medium: calc( var(--td-font-size-headline-medium) + var(--td-line-height-common) ); --td-line-height-headline-large: calc( var(--td-font-size-headline-large) + var(--td-line-height-common) ); --td-line-height-display-medium: calc( var(--td-font-size-display-medium) + var(--td-line-height-common) ); --td-line-height-display-large: calc( var(--td-font-size-display-large) + var(--td-line-height-common) ); --td-font-link-small: var(--td-font-size-link-small) / var(--td-line-height-link-small) var(--td-font-family); --td-font-link-medium: var(--td-font-size-link-medium) / var(--td-line-height-link-medium) var(--td-font-family); --td-font-link-large: var(--td-font-size-link-large) / var(--td-line-height-link-large) var(--td-font-family); --td-font-mark-small: 600 var(--td-font-size-mark-small) / var(--td-line-height-mark-small) var(--td-font-family); --td-font-mark-medium: 600 var(--td-font-size-mark-medium) / var(--td-line-height-mark-medium) var(--td-font-family); --td-font-body-small: var(--td-font-size-body-small) / var(--td-line-height-body-small) var(--td-font-family); --td-font-body-medium: var(--td-font-size-body-medium) / var(--td-line-height-body-medium) var(--td-font-family); --td-font-body-large: var(--td-font-size-body-large) / var(--td-line-height-body-large) var(--td-font-family); --td-font-title-small: var(--td-font-size-title-small) / var(--td-line-height-title-small) var(--td-font-family); --td-font-title-medium: var(--td-font-size-title-medium) / var(--td-line-height-title-medium) var(--td-font-family); --td-font-title-large: var(--td-font-size-title-large) / var(--td-line-height-title-large) var(--td-font-family); --td-font-headline-small: var(--td-font-size-headline-small) / var(--td-line-height-headline-small) var(--td-font-family); --td-font-headline-medium: var(--td-font-size-headline-medium) / var(--td-line-height-headline-medium) var(--td-font-family); --td-font-headline-large: var(--td-font-size-headline-large) / var(--td-line-height-headline-large) var(--td-font-family); --td-font-display-medium: var(--td-font-size-display-medium) / var(--td-line-height-display-medium) var(--td-font-family); --td-font-display-large: var(--td-font-size-display-large) / var(--td-line-height-display-large) var(--td-font-family); /* 字体颜色 */ --td-text-color-primary: var(--td-font-gray-1); --td-text-color-secondary: var(--td-font-gray-2); --td-text-color-placeholder: var(--td-font-gray-3); --td-text-color-disabled: var(--td-font-gray-4); --td-text-color-anti: #fff; --td-text-color-brand: var(--td-brand-color); --td-text-color-link: var(--td-brand-color); /* end 字体配置 */ + /* 字体配置 */ --td-font-family: var(--app-font-family); --td-font-family-medium: var(--app-font-family); --td-font-size-link-small: calc(12px * var(--app-font-scale, 1)); --td-font-size-link-medium: calc(14px * var(--app-font-scale, 1)); --td-font-size-link-large: calc(16px * var(--app-font-scale, 1)); --td-font-size-mark-small: calc(12px * var(--app-font-scale, 1)); --td-font-size-mark-medium: calc(14px * var(--app-font-scale, 1)); --td-font-size-body-small: calc(12px * var(--app-font-scale, 1)); --td-font-size-body-medium: calc(14px * var(--app-font-scale, 1)); --td-font-size-body-large: calc(16px * var(--app-font-scale, 1)); --td-font-size-title-small: calc(14px * var(--app-font-scale, 1)); --td-font-size-title-medium: calc(16px * var(--app-font-scale, 1)); --td-font-size-title-large: calc(20px * var(--app-font-scale, 1)); --td-font-size-headline-small: calc(24px * var(--app-font-scale, 1)); --td-font-size-headline-medium: calc(28px * var(--app-font-scale, 1)); --td-font-size-headline-large: calc(36px * var(--app-font-scale, 1)); --td-font-size-display-medium: calc(48px * var(--app-font-scale, 1)); --td-font-size-display-large: calc(64px * var(--app-font-scale, 1)); --td-line-height-common: 8px; --td-line-height-link-small: calc( var(--td-font-size-link-small) + var(--td-line-height-common) ); --td-line-height-link-medium: calc( var(--td-font-size-link-medium) + var(--td-line-height-common) ); --td-line-height-link-large: calc( var(--td-font-size-link-large) + var(--td-line-height-common) ); --td-line-height-mark-small: calc( var(--td-font-size-mark-small) + var(--td-line-height-common) ); --td-line-height-mark-medium: calc( var(--td-font-size-mark-medium) + var(--td-line-height-common) ); --td-line-height-body-small: calc( var(--td-font-size-body-small) + var(--td-line-height-common) ); --td-line-height-body-medium: calc( var(--td-font-size-body-medium) + var(--td-line-height-common) ); --td-line-height-body-large: calc( var(--td-font-size-body-large) + var(--td-line-height-common) ); --td-line-height-title-small: calc( var(--td-font-size-title-small) + var(--td-line-height-common) ); --td-line-height-title-medium: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-title-large: calc( var(--td-font-size-title-medium) + var(--td-line-height-common) ); --td-line-height-headline-small: calc( var(--td-font-size-headline-small) + var(--td-line-height-common) ); --td-line-height-headline-medium: calc( var(--td-font-size-headline-medium) + var(--td-line-height-common) ); --td-line-height-headline-large: calc( var(--td-font-size-headline-large) + var(--td-line-height-common) ); --td-line-height-display-medium: calc( var(--td-font-size-display-medium) + var(--td-line-height-common) ); --td-line-height-display-large: calc( var(--td-font-size-display-large) + var(--td-line-height-common) ); --td-font-link-small: var(--td-font-size-link-small) / var(--td-line-height-link-small) var(--td-font-family); --td-font-link-medium: var(--td-font-size-link-medium) / var(--td-line-height-link-medium) var(--td-font-family); --td-font-link-large: var(--td-font-size-link-large) / var(--td-line-height-link-large) var(--td-font-family); --td-font-mark-small: 600 var(--td-font-size-mark-small) / var(--td-line-height-mark-small) var(--td-font-family); --td-font-mark-medium: 600 var(--td-font-size-mark-medium) / var(--td-line-height-mark-medium) var(--td-font-family); --td-font-body-small: var(--td-font-size-body-small) / var(--td-line-height-body-small) var(--td-font-family); --td-font-body-medium: var(--td-font-size-body-medium) / var(--td-line-height-body-medium) var(--td-font-family); --td-font-body-large: var(--td-font-size-body-large) / var(--td-line-height-body-large) var(--td-font-family); --td-font-title-small: var(--td-font-size-title-small) / var(--td-line-height-title-small) var(--td-font-family); --td-font-title-medium: var(--td-font-size-title-medium) / var(--td-line-height-title-medium) var(--td-font-family); --td-font-title-large: var(--td-font-size-title-large) / var(--td-line-height-title-large) var(--td-font-family); --td-font-headline-small: var(--td-font-size-headline-small) / var(--td-line-height-headline-small) var(--td-font-family); --td-font-headline-medium: var(--td-font-size-headline-medium) / var(--td-line-height-headline-medium) var(--td-font-family); --td-font-headline-large: var(--td-font-size-headline-large) / var(--td-line-height-headline-large) var(--td-font-family); --td-font-display-medium: var(--td-font-size-display-medium) / var(--td-line-height-display-medium) var(--td-font-family); --td-font-display-large: var(--td-font-size-display-large) / var(--td-line-height-display-large) var(--td-font-family); /* 字体颜色 */ --td-text-color-primary: var(--td-font-gray-1); --td-text-color-secondary: var(--td-font-gray-2); --td-text-color-placeholder: var(--td-font-gray-3); --td-text-color-disabled: var(--td-font-gray-4); --td-text-color-anti: #fff; --td-text-color-brand: var(--td-brand-color); --td-text-color-link: var(--td-brand-color); /* end 字体配置 */ /* 圆角配置 */ --td-radius-small: 2px; --td-radius-default: 3px; --td-radius-medium: 6px; --td-radius-large: 9px; --td-radius-extraLarge: 12px; --td-radius-round: 999px; --td-radius-circle: 50%; /* end 圆角配置 */ diff --git a/frontend/src/composables/useFont.ts b/frontend/src/composables/useFont.ts index f9f0da14..0abdf4ab 100644 --- a/frontend/src/composables/useFont.ts +++ b/frontend/src/composables/useFont.ts @@ -83,22 +83,55 @@ function readUserId(): string { } } +function safeGetItem(key: string): string | null { + try { + return localStorage.getItem(key) + } catch { + return null + } +} + +function safeSetItem(key: string, value: string): void { + try { + localStorage.setItem(key, value) + } catch { + // Quota / disabled storage / private mode — preference applies to this session only. + } +} + +/** + * Look up a stored preference, falling back through: + * 1. The current user's namespace + * 2. The "anon" namespace (settings chosen on the login screen) + * 3. A legacy un-namespaced key (from earlier versions of this branch) + */ +function resolveStorageValue(suffix: string): string | null { + const userId = readUserId() + const userValue = safeGetItem(`WeKnora_${userId}_${suffix}`) + if (userValue !== null) return userValue + if (userId !== 'anon') { + const anonValue = safeGetItem(`WeKnora_anon_${suffix}`) + if (anonValue !== null) return anonValue + } + return safeGetItem(`WeKnora_${suffix}`) +} + function nsKey(suffix: string): string { return `WeKnora_${readUserId()}_${suffix}` } function loadSans(): FontKey { - const v = localStorage.getItem(nsKey(SANS_KEY)) + const v = resolveStorageValue(SANS_KEY) return isFontKey(v) ? v : DEFAULT_SANS } function loadMono(): MonoFontKey { - const v = localStorage.getItem(nsKey(MONO_KEY)) + const v = resolveStorageValue(MONO_KEY) return isMonoFontKey(v) ? v : DEFAULT_MONO } function loadSize(): FontSizeKey { - const v = localStorage.getItem(nsKey(SIZE_KEY)) + const v = resolveStorageValue(SIZE_KEY) return isFontSizeKey(v) ? v : DEFAULT_SIZE } @@ -108,27 +141,34 @@ const currentSize = ref(loadSize()) function applyFont() { const root = document.documentElement - root.style.setProperty('--app-font-family', SANS_STACKS[currentSans.value]) - root.style.setProperty('--app-font-family-mono', MONO_STACKS[currentMono.value]) - root.style.setProperty('--app-font-scale', String(FONT_SCALES[currentSize.value])) + if (!root) return + const sansStack = SANS_STACKS[currentSans.value] ?? SANS_STACKS[DEFAULT_SANS] + const monoStack = MONO_STACKS[currentMono.value] ?? MONO_STACKS[DEFAULT_MONO] + const scale = FONT_SCALES[currentSize.value] ?? FONT_SCALES[DEFAULT_SIZE] + root.style.setProperty('--app-font-family', sansStack) + root.style.setProperty('--app-font-family-mono', monoStack) + root.style.setProperty('--app-font-scale', String(scale)) } export function useFont() { function setSansFont(key: FontKey) { + if (!isFontKey(key)) return currentSans.value = key - localStorage.setItem(nsKey(SANS_KEY), key) + safeSetItem(nsKey(SANS_KEY), key) applyFont() } function setMonoFont(key: MonoFontKey) { + if (!isMonoFontKey(key)) return currentMono.value = key - localStorage.setItem(nsKey(MONO_KEY), key) + safeSetItem(nsKey(MONO_KEY), key) applyFont() } function setFontSize(key: FontSizeKey) { + if (!isFontSizeKey(key)) return currentSize.value = key - localStorage.setItem(nsKey(SIZE_KEY), key) + safeSetItem(nsKey(SIZE_KEY), key) applyFont() } diff --git a/frontend/src/composables/useTheme.ts b/frontend/src/composables/useTheme.ts index 0eae1e83..01cd1877 100644 --- a/frontend/src/composables/useTheme.ts +++ b/frontend/src/composables/useTheme.ts @@ -2,7 +2,7 @@ import { ref } from 'vue' export type ThemeMode = 'light' | 'dark' | 'system' -const STORAGE_SUFFIX = 'theme' +const THEME_KEY = 'theme' function readUserId(): string { try { @@ -15,12 +15,45 @@ function readUserId(): string { } } +function safeGetItem(key: string): string | null { + try { + return localStorage.getItem(key) + } catch { + return null + } +} + +function safeSetItem(key: string, value: string): void { + try { + localStorage.setItem(key, value) + } catch { + // Quota / disabled storage / private mode — preference applies to this session only. + } +} + +/** + * Look up a stored preference, falling back through: + * 1. The current user's namespace + * 2. The "anon" namespace (settings chosen on the login screen) + * 3. A legacy un-namespaced key (from earlier versions of this branch) + */ +function resolveStorageValue(suffix: string): string | null { + const userId = readUserId() + const userValue = safeGetItem(`WeKnora_${userId}_${suffix}`) + if (userValue !== null) return userValue + if (userId !== 'anon') { + const anonValue = safeGetItem(`WeKnora_anon_${suffix}`) + if (anonValue !== null) return anonValue + } + return safeGetItem(`WeKnora_${suffix}`) +} + function nsKey(): string { - return `WeKnora_${readUserId()}_${STORAGE_SUFFIX}` + return `WeKnora_${readUserId()}_${THEME_KEY}` } function loadTheme(): ThemeMode { - const v = localStorage.getItem(nsKey()) + const v = resolveStorageValue(THEME_KEY) if (v === 'light' || v === 'dark' || v === 'system') return v return 'light' } @@ -76,8 +109,9 @@ function applyTheme(mode: ThemeMode) { export function useTheme() { function setTheme(mode: ThemeMode) { + if (mode !== 'light' && mode !== 'dark' && mode !== 'system') return currentTheme.value = mode - localStorage.setItem(nsKey(), mode) + safeSetItem(nsKey(), mode) applyTheme(mode) } diff --git a/frontend/src/views/settings/GeneralSettings.vue b/frontend/src/views/settings/GeneralSettings.vue index 85d87357..31e29426 100755 --- a/frontend/src/views/settings/GeneralSettings.vue +++ b/frontend/src/views/settings/GeneralSettings.vue @@ -106,7 +106,6 @@
{{ $t('font.size.small') }} @@ -160,7 +159,7 @@