From af1e4c8b70cedbeb32889240cc01b7d98b7d1549 Mon Sep 17 00:00:00 2001 From: Xylight Date: Mon, 6 May 2024 16:57:53 -0700 Subject: [PATCH] fix: inconsistent padding with top nav --- .../lemmy/community/CommunityCard.svelte | 17 ++++++++++---- src/lib/components/ui/ExpandableImage.svelte | 4 ++-- src/lib/components/ui/layout/Shell.svelte | 23 +++++++++++-------- .../components/ui/layout/pages/Header.svelte | 5 ++++ src/lib/components/ui/sidebar/Sidebar.svelte | 2 +- src/routes/+layout.svelte | 4 ++-- src/routes/+page.svelte | 12 ++-------- .../post/[instance]/[id=integer]/+page.svelte | 5 +++- 8 files changed, 42 insertions(+), 30 deletions(-) create mode 100644 src/lib/components/ui/layout/pages/Header.svelte diff --git a/src/lib/components/lemmy/community/CommunityCard.svelte b/src/lib/components/lemmy/community/CommunityCard.svelte index 6d64bc26..f201d80a 100644 --- a/src/lib/components/lemmy/community/CommunityCard.svelte +++ b/src/lib/components/lemmy/community/CommunityCard.svelte @@ -25,12 +25,14 @@ import { BuildingOffice2, Calendar, + ChartBar, ChatBubbleOvalLeftEllipsis, Check, Cog6Tooth, EllipsisHorizontal, Fire, Icon, + InformationCircle, Newspaper, NoSymbol, PencilSquare, @@ -41,6 +43,7 @@ import CommunityLink from './CommunityLink.svelte' import Expandable from '$lib/components/ui/Expandable.svelte' import LabelStat from '$lib/components/ui/LabelStat.svelte' + import ShieldIcon from '../moderation/ShieldIcon.svelte' export let community_view: CommunityView export let moderators: CommunityModeratorView[] = [] @@ -215,15 +218,19 @@
- About + + About + - Stats + + Stats +
0} - Moderators + + Moderators +
history.back()} >
diff --git a/src/lib/components/ui/layout/Shell.svelte b/src/lib/components/ui/layout/Shell.svelte index 0bde4ef4..5dd28405 100644 --- a/src/lib/components/ui/layout/Shell.svelte +++ b/src/lib/components/ui/layout/Shell.svelte @@ -13,10 +13,12 @@ content: boolean ): string => { if (panel) { - if (top) return '!pt-22' - else return '!pb-22 !pt-4' + if (top) { + if (content) return '!pt-20' + else return 'top-16' + } else return '!pb-20' } else { - if (!content) return '!pt-4' + if (!content) return '' if (top) return '!pt-24' else return '!pb-24' @@ -35,6 +37,7 @@ $userSettings.dock.top, false ) + $: topPanel = $userSettings.dock.noGap && $userSettings.dock.top
@@ -43,7 +46,8 @@ class=" {$userSettings.dock.noGap ? '' : 'p-4 max-w-3xl left-1/2 -translate-x-1/2'} {$userSettings.dock.top ? 'top-0' : 'bottom-0'} - w-full fixed z-50 pointer-events-none" + {topPanel ? 'fixed top-0' : 'fixed'} + w-full z-50 pointer-events-none" style="grid-area: navbar;" >