diff --git a/packages/hoppscotch-common/assets/scss/themes.scss b/packages/hoppscotch-common/assets/scss/themes.scss index c5782e3f9..fee75720a 100644 --- a/packages/hoppscotch-common/assets/scss/themes.scss +++ b/packages/hoppscotch-common/assets/scss/themes.scss @@ -2,7 +2,20 @@ --font-sans: "Inter Variable", sans-serif; --font-icon: "Material Symbols Rounded Variable"; --font-mono: "Roboto Mono Variable", monospace; - --font-size-tiny: calc(var(--font-size-body) - 0.062rem); + --font-size-body: 0.75rem; + --font-size-tiny: 0.688rem; + --line-height-body: 1rem; + --upper-primary-sticky-fold: 4.125rem; + --upper-secondary-sticky-fold: 6.188rem; + --upper-tertiary-sticky-fold: 8.25rem; + --upper-mobile-primary-sticky-fold: 6.625rem; + --upper-mobile-secondary-sticky-fold: 8.688rem; + --upper-mobile-sticky-fold: 10.75rem; + --upper-mobile-tertiary-sticky-fold: 8.25rem; + --lower-primary-sticky-fold: 3rem; + --lower-secondary-sticky-fold: 5.063rem; + --lower-tertiary-sticky-fold: 7.125rem; + --sidebar-primary-sticky-fold: 2rem; } @mixin dark-theme { @@ -200,8 +213,8 @@ :root { @include base-theme; @include dark-theme; - @include green-theme; @include dark-editor-theme; + @include green-theme; } :root.light { @@ -257,63 +270,3 @@ :root[data-accent="yellow"] { @include yellow-theme; } - -@mixin font-small { - --font-size-body: 0.75rem; - --line-height-body: 1rem; - --upper-primary-sticky-fold: 4.125rem; - --upper-secondary-sticky-fold: 6.188rem; - --upper-tertiary-sticky-fold: 8.25rem; - --upper-mobile-primary-sticky-fold: 6.625rem; - --upper-mobile-secondary-sticky-fold: 8.688rem; - --upper-mobile-sticky-fold: 10.75rem; - --upper-mobile-tertiary-sticky-fold: 8.25rem; - --lower-primary-sticky-fold: 3rem; - --lower-secondary-sticky-fold: 5.063rem; - --lower-tertiary-sticky-fold: 7.125rem; - --sidebar-primary-sticky-fold: 2rem; -} - -@mixin font-medium { - --font-size-body: 0.875rem; - --line-height-body: 1.25rem; - --upper-primary-sticky-fold: 4.375rem; - --upper-secondary-sticky-fold: 6.688rem; - --upper-tertiary-sticky-fold: 9rem; - --upper-mobile-primary-sticky-fold: 7.125rem; - --upper-mobile-secondary-sticky-fold: 9.438rem; - --upper-mobile-sticky-fold: 11.75rem; - --upper-mobile-tertiary-sticky-fold: 9rem; - --lower-primary-sticky-fold: 3.25rem; - --lower-secondary-sticky-fold: 5.563rem; - --lower-tertiary-sticky-fold: 7.875rem; - --sidebar-primary-sticky-fold: 2.25rem; -} - -@mixin font-large { - --font-size-body: 1rem; - --line-height-body: 1.5rem; - --upper-primary-sticky-fold: 4.625rem; - --upper-secondary-sticky-fold: 7.188rem; - --upper-tertiary-sticky-fold: 9.75rem; - --upper-mobile-primary-sticky-fold: 7.625rem; - --upper-mobile-secondary-sticky-fold: 10.188rem; - --upper-mobile-sticky-fold: 12.75rem; - --upper-mobile-tertiary-sticky-fold: 9.75rem; - --lower-primary-sticky-fold: 3.5rem; - --lower-secondary-sticky-fold: 6.063rem; - --lower-tertiary-sticky-fold: 8.625rem; - --sidebar-primary-sticky-fold: 2.5rem; -} - -:root[data-font-size="small"] { - @include font-small; -} - -:root[data-font-size="medium"] { - @include font-medium; -} - -:root[data-font-size="large"] { - @include font-large; -} diff --git a/packages/hoppscotch-common/src/components/realtime/LogEntry.vue b/packages/hoppscotch-common/src/components/realtime/LogEntry.vue index 59c3cca35..d36e73576 100644 --- a/packages/hoppscotch-common/src/components/realtime/LogEntry.vue +++ b/packages/hoppscotch-common/src/components/realtime/LogEntry.vue @@ -17,7 +17,7 @@ {{ shortDateTime(entry.ts) }} @@ -406,8 +406,4 @@ const icon = computed(() => markRaw(ICONS[props.entry.source].icon)) @apply transition; @apply hover: text-secondary; } - -.ts-font { - font-size: 0.6rem; -} diff --git a/packages/hoppscotch-common/src/components/smart/FontSizePicker.vue b/packages/hoppscotch-common/src/components/smart/FontSizePicker.vue deleted file mode 100644 index 31fda5a06..000000000 --- a/packages/hoppscotch-common/src/components/smart/FontSizePicker.vue +++ /dev/null @@ -1,71 +0,0 @@ - - - diff --git a/packages/hoppscotch-common/src/layouts/default.vue b/packages/hoppscotch-common/src/layouts/default.vue index 76a7a831c..4d15b19a6 100644 --- a/packages/hoppscotch-common/src/layouts/default.vue +++ b/packages/hoppscotch-common/src/layouts/default.vue @@ -79,7 +79,6 @@ const router = useRouter() const showSearch = ref(false) const showSupport = ref(false) -const fontSize = useSetting("FONT_SIZE") const expandNavigation = useSetting("EXPAND_NAVIGATION") const rightSidebar = useSetting("SIDEBAR") const columnLayout = useSetting("COLUMN_LAYOUT") @@ -132,24 +131,9 @@ watch(mdAndLarger, () => { columnLayout.value = true } }) - -const spacerClass = computed(() => { - if (fontSize.value === "small" && expandNavigation.value) - return "spacer-small" - if (fontSize.value === "medium" && expandNavigation.value) - return "spacer-medium" - if (fontSize.value === "large" && expandNavigation.value) - return "spacer-large" - if ( - (fontSize.value === "small" || - fontSize.value === "medium" || - fontSize.value === "large") && - !expandNavigation.value - ) - return "spacer-expand" - - return "" -}) +const spacerClass = computed(() => + expandNavigation.value ? "spacer-small" : "spacer-expand" +) defineActionHandler("modals.search.toggle", () => { showSearch.value = !showSearch.value diff --git a/packages/hoppscotch-common/src/modules/theming.ts b/packages/hoppscotch-common/src/modules/theming.ts index 3be8ef88f..5e90356d3 100644 --- a/packages/hoppscotch-common/src/modules/theming.ts +++ b/packages/hoppscotch-common/src/modules/theming.ts @@ -68,23 +68,9 @@ const applyAccentColor = (_app: App) => { ) } -// eslint-disable-next-line @typescript-eslint/no-unused-vars -const applyFontSize = (_app: App) => { - const [pref] = useSettingStatic("FONT_SIZE") - - watch( - pref, - (newPref) => { - document.documentElement.setAttribute("data-font-size", newPref) - }, - { immediate: true } - ) -} - export default { onVueAppInit(app) { applyColorMode(app) applyAccentColor(app) - applyFontSize(app) }, } diff --git a/packages/hoppscotch-common/src/newstore/settings.ts b/packages/hoppscotch-common/src/newstore/settings.ts index 48b3f86d0..a6ab0e12b 100644 --- a/packages/hoppscotch-common/src/newstore/settings.ts +++ b/packages/hoppscotch-common/src/newstore/settings.ts @@ -23,10 +23,6 @@ export const HoppAccentColors = [ export type HoppAccentColor = (typeof HoppAccentColors)[number] -export const HoppFontSizes = ["small", "medium", "large"] as const - -export type HoppFontSize = (typeof HoppFontSizes)[number] - export type SettingsDef = { syncCollections: boolean syncHistory: boolean @@ -49,7 +45,6 @@ export type SettingsDef = { EXPAND_NAVIGATION: boolean SIDEBAR: boolean SIDEBAR_ON_LEFT: boolean - FONT_SIZE: HoppFontSize COLUMN_LAYOUT: boolean } @@ -75,7 +70,6 @@ export const getDefaultSettings = (): SettingsDef => ({ EXPAND_NAVIGATION: true, SIDEBAR: true, SIDEBAR_ON_LEFT: true, - FONT_SIZE: "small", COLUMN_LAYOUT: true, }) diff --git a/packages/hoppscotch-common/src/pages/settings.vue b/packages/hoppscotch-common/src/pages/settings.vue index ee8f7055c..665ba16e7 100644 --- a/packages/hoppscotch-common/src/pages/settings.vue +++ b/packages/hoppscotch-common/src/pages/settings.vue @@ -1,6 +1,6 @@