diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index e7e859d20c..4022a6bfb0 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -95,9 +95,13 @@ } //#endregion - const fontSize = localStorage.getItem("fontSize"); + let fontSize = localStorage.getItem("fontSize"); if (fontSize) { - document.documentElement.classList.add("f-" + fontSize); + if (fontSize < 10) { // need to do this for now, as values before were 1, 2, 3 depending on the option + localStorage.setItem("fontSize", null); + fontSize = localStorage.getItem("fontSize"); + } + document.documentElement.style.fontSize = fontSize + "px"; } const useSystemFont = localStorage.getItem("useSystemFont"); diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue index c06a879a60..a384c5124e 100644 --- a/packages/client/src/components/form/range.vue +++ b/packages/client/src/components/form/range.vue @@ -23,9 +23,9 @@ /> diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue index 0409cf6cec..08c27bcf76 100644 --- a/packages/client/src/components/global/MkPageHeader.vue +++ b/packages/client/src/components/global/MkPageHeader.vue @@ -431,7 +431,8 @@ onUnmounted(() => { > .icon { margin-right: 8px; - width: 16px; + min-width: 16px; + width: 1em; text-align: center; } @@ -508,10 +509,11 @@ onUnmounted(() => { } &.collapse { - --width: 38px; + --width: 2.7em; + // --width: 1.33333em > .tab { - width: 38px; - min-width: 38px !important; + width: 2.7em; + min-width: 2.7em !important; &:not(.active) > .title { opacity: 0; } diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue index bce8b6561d..cf75d4fe6e 100644 --- a/packages/client/src/pages/settings/general.vue +++ b/packages/client/src/pages/settings/general.vue @@ -114,18 +114,34 @@ - - - + + + diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss index 6e6a1daec9..38870cc561 100644 --- a/packages/client/src/style.scss +++ b/packages/client/src/style.scss @@ -54,20 +54,8 @@ html { tab-size: 2; scroll-padding: 60px; - &.f-1 { - font-size: 15px; - } - - &.f-2 { - font-size: 16px; - } - - &.f-3 { - font-size: 17px; - } - &.useSystemFont { - font-family: sans-serif; + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; } } body::-webkit-scrollbar {