diff options
| author | Marie <github@yuugi.dev> | 2024-10-03 17:39:32 +0000 |
|---|---|---|
| committer | Marie <github@yuugi.dev> | 2024-10-03 17:39:32 +0000 |
| commit | 0f71dc6a07366c6af820d1df7ac3ace022d54db5 (patch) | |
| tree | 9ab390f1947c0e6f598ce57ad79d8c9a36565c27 | |
| parent | merge: alert when searching notes from widget, and search is disabled - fixes... (diff) | |
| parent | fix #332 - classic view navbar now respects "side (icon only)" (diff) | |
| download | sharkey-0f71dc6a07366c6af820d1df7ac3ace022d54db5.tar.gz sharkey-0f71dc6a07366c6af820d1df7ac3ace022d54db5.tar.bz2 sharkey-0f71dc6a07366c6af820d1df7ac3ace022d54db5.zip | |
merge: fix #332 - classic view navbar now respects "side (icon only)" (!630)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/630
Closes #332
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
| -rw-r--r-- | packages/frontend/src/ui/classic.sidebar.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/frontend/src/ui/classic.sidebar.vue b/packages/frontend/src/ui/classic.sidebar.vue index dbb7590978..c859626571 100644 --- a/packages/frontend/src/ui/classic.sidebar.vue +++ b/packages/frontend/src/ui/classic.sidebar.vue @@ -66,7 +66,6 @@ import { i18n } from '@/i18n.js'; const WINDOW_THRESHOLD = 1400; const menu = ref(defaultStore.state.menu); -const menuDisplay = computed(defaultStore.makeGetterSetter('menuDisplay')); const otherNavItemIndicated = computed<boolean>(() => { for (const def in navbarItemDef) { if (menu.value.includes(def)) continue; @@ -81,10 +80,12 @@ const iconOnly = ref(false); const settingsWindowed = ref(false); function calcViewState() { - iconOnly.value = (window.innerWidth <= WINDOW_THRESHOLD) || (menuDisplay.value === 'sideIcon'); + iconOnly.value = (window.innerWidth <= WINDOW_THRESHOLD) || (defaultStore.state.menuDisplay === 'sideIcon'); settingsWindowed.value = (window.innerWidth > WINDOW_THRESHOLD); } +calcViewState(); + function more(ev: MouseEvent) { const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), { src: ev.currentTarget ?? ev.target, |