From 10f0ed208f436dde7a7a514b6e064b14eb354877 Mon Sep 17 00:00:00 2001
From: Xylight <80978739+Xyphyn@users.noreply.github.com>
Date: Sun, 16 Feb 2025 19:12:58 -0800
Subject: [PATCH] cleanup: switch to a css-based navbar (#491)
* cleanup: remove dock options and make adaptive by default
* cleanup: switch to css-based navbar
* feat: add auto hide option
---
src/lib/components/ui/layout/Shell.svelte | 156 ++++--------------
.../components/ui/layout/pages/Header.svelte | 22 ++-
src/lib/components/ui/navbar/NavButton.svelte | 42 ++---
src/lib/components/ui/navbar/Navbar.svelte | 2 +-
src/lib/i18n/en.json | 4 +
src/lib/mono/button/Button.svelte | 30 ++--
src/lib/settings.svelte.ts | 6 +-
src/routes/admin/+layout.svelte | 6 +-
src/routes/c/[name]/settings/+layout.svelte | 7 +-
src/routes/communities/+page.svelte | 11 +-
src/routes/inbox/+page.svelte | 7 +-
.../post/[instance]/[id=integer]/+page.svelte | 8 +-
src/routes/profile/+layout.svelte | 4 +-
src/routes/saved/+page.svelte | 6 +-
src/routes/search/+page.svelte | 6 +-
src/routes/settings/+page.svelte | 50 +-----
src/routes/util/+layout.svelte | 4 +-
17 files changed, 110 insertions(+), 261 deletions(-)
diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte
index cd17b2b3..f6360570 100644
--- a/src/lib/components/ui/layout/Shell.svelte
+++ b/src/lib/components/ui/layout/Shell.svelte
@@ -1,100 +1,8 @@
-
-
+
+
{@render children?.()}
{@render navbar?.({
- class: `
- ${
- dockProps.noGap
- ? dockProps.top
- ? 'border-b shadow-none rounded-none'
- : 'border-t rounded-none'
- : 'border rounded-full'
- }
-
- dark:bg-transparent transition-colors duration-500
- pointer-events-auto backdrop-blur-xl ${
- topPanel
- ? 'bg-slate-50/50 dark:bg-zinc-950/90 border-slate-100 dark:border-zinc-900'
- : `border-slate-200 dark:border-zinc-800 shadow-2xl
- bg-white/50 dark:bg-zinc-950/70`
- }`,
- style: 'transition: border-radius 250ms;',
+ class: `bg-slate-50/50 dark:bg-zinc-950/90 border-slate-100 dark:border-zinc-900
+ pointer-events-auto backdrop-blur-xl border lg:border-t-0 lg:border-x-0
+ rounded-full lg:rounded-none`,
})}
{@render sidebar?.({
class: `hidden md:flex sticky top-0 left-0 h-max bg-slate-50 dark:bg-zinc-950
- z-40
- ${sidePadding.class}`,
+ z-40 lg:top-16`,
style: 'grid-area: sidebar; width: 100% !important;',
})}
{@render main?.({
- class: `w-full bg-slate-25 dark:bg-zinc-925 justify-self-center shadow-sm z-0
- ${contentPadding.class} main`,
+ class: `w-full bg-slate-25 dark:bg-zinc-925 justify-self-center shadow-sm z-0 main !pb-22 lg:!pb-0`,
style: 'grid-area: main',
})}
{@render suffix?.({
- class: `max-xl:hidden w-full sticky top-0 left-0 max-h-screen bg-slate-50 dark:bg-zinc-950 z-40 ${sidePadding.class}`,
+ class: `max-xl:hidden w-full sticky top-0 left-0 max-h-screen bg-slate-50 dark:bg-zinc-950
+ z-40 lg:top-16`,
style: 'grid-area: suffix;',
})}
diff --git a/src/lib/components/ui/layout/pages/Header.svelte b/src/lib/components/ui/layout/pages/Header.svelte
index e725fbec..c11644b9 100644
--- a/src/lib/components/ui/layout/pages/Header.svelte
+++ b/src/lib/components/ui/layout/pages/Header.svelte
@@ -1,6 +1,5 @@
diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte
index ac654f3f..73a58039 100644
--- a/src/lib/components/ui/navbar/Navbar.svelte
+++ b/src/lib/components/ui/navbar/Navbar.svelte
@@ -50,7 +50,7 @@
}}
href="/"
label={$t('nav.home')}
- class="ml-2 logo"
+ class="ml-2 lg:ml-2 logo border-0 lg:rounded-full lg:w-10 lg:h-10 lg:!p-0"
adaptive={false}
>
{#snippet customIcon()}
diff --git a/src/lib/i18n/en.json b/src/lib/i18n/en.json
index 5ffabe1b..e66cae1e 100644
--- a/src/lib/i18n/en.json
+++ b/src/lib/i18n/en.json
@@ -698,6 +698,10 @@
"pins": {
"title": "Pins",
"description": "Click a pin to send it to the top of the sidebar. Right click a pinned item to remove it."
+ },
+ "autoHide": {
+ "title": "Auto hide dock",
+ "description": "Hides the dock on mobile when you scroll down, re-appears when you scroll up."
}
},
"app": {
diff --git a/src/lib/mono/button/Button.svelte b/src/lib/mono/button/Button.svelte
index 6bb2cfdf..4d7315db 100644
--- a/src/lib/mono/button/Button.svelte
+++ b/src/lib/mono/button/Button.svelte
@@ -121,7 +121,7 @@
animations?: any
loaderWidth?: number | undefined
href?: string | undefined
- class?: string
+ class?: ClassValue
prefix?: Snippet
children?: Snippet
suffix?: Snippet
@@ -133,7 +133,7 @@
@@ -342,8 +341,7 @@
diff --git a/src/routes/profile/+layout.svelte b/src/routes/profile/+layout.svelte
index a2ace3c0..413c0c9e 100644
--- a/src/routes/profile/+layout.svelte
+++ b/src/routes/profile/+layout.svelte
@@ -4,7 +4,6 @@
import MultiSelect from '$lib/components/input/Switch.svelte'
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
- import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
import { site } from '$lib/lemmy.svelte'
import { t } from '$lib/translations'
import { feature } from '$lib/version'
@@ -31,8 +30,7 @@
-
+
`?page=${page}`} page={data.page} />
diff --git a/src/routes/search/+page.svelte b/src/routes/search/+page.svelte
index a397eaf1..02d1f8d5 100644
--- a/src/routes/search/+page.svelte
+++ b/src/routes/search/+page.svelte
@@ -38,7 +38,6 @@
import { t } from '$lib/translations.js'
import Header from '$lib/components/ui/layout/pages/Header.svelte'
import Tabs from '$lib/components/ui/layout/pages/Tabs.svelte'
- import { contentPadding } from '$lib/components/ui/layout/Shell.svelte'
import { goto } from '$app/navigation'
import Option from 'mono-svelte/forms/select/Option.svelte'
import Skeleton from '$lib/components/ui/generic/Skeleton.svelte'
@@ -71,10 +70,7 @@
{$t('routes.search.title')}