From 63eafdd1e1a23a07da6855bb5a9e05283deea864 Mon Sep 17 00:00:00 2001 From: James Xylight Date: Fri, 5 Sep 2025 16:34:55 -0700 Subject: [PATCH] design: make pageination more consistent with other floats --- .../lemmy/post/form/PostForm.svelte | 5 +- src/lib/components/ui/Pageination.svelte | 104 +++++++++--------- .../components/ui/layout/pages/Tabs.svelte | 10 +- src/routes/communities/+page.svelte | 5 +- .../(local_user)/password/+layout.svelte | 4 +- src/routes/saved/+page.svelte | 1 + 6 files changed, 70 insertions(+), 59 deletions(-) diff --git a/src/lib/components/lemmy/post/form/PostForm.svelte b/src/lib/components/lemmy/post/form/PostForm.svelte index a20cb529..ec10fcda 100644 --- a/src/lib/components/lemmy/post/form/PostForm.svelte +++ b/src/lib/components/lemmy/post/form/PostForm.svelte @@ -314,10 +314,11 @@
{$t('form.post.community')} + {/if} + + {#if page} +
+ {#key page} +
+ {page} +
+ {/key} +
+ {/if} + - {/if} - - {#if page} -
- {#key page} -
- {page} -
- {/key} -
- {/if} - - - + +{/if} diff --git a/src/lib/components/ui/layout/pages/Tabs.svelte b/src/lib/components/ui/layout/pages/Tabs.svelte index b223e9f6..c5987db7 100644 --- a/src/lib/components/ui/layout/pages/Tabs.svelte +++ b/src/lib/components/ui/layout/pages/Tabs.svelte @@ -13,6 +13,7 @@ buildUrl?: (currentRoute: SvelteURL | undefined, href: string) => string children?: import('svelte').Snippet style?: 'header' | 'subpage' + margin?: boolean } let { @@ -21,6 +22,7 @@ buildUrl = (_, href) => href, children, style = 'header', + margin = true, }: Props = $props() let matchType = $derived<('search' | 'pathname')[]>( @@ -53,10 +55,12 @@ - -{#if style == 'subpage'} -
-{/if} diff --git a/src/routes/communities/+page.svelte b/src/routes/communities/+page.svelte index c06ee075..3fc22943 100644 --- a/src/routes/communities/+page.svelte +++ b/src/routes/communities/+page.svelte @@ -17,6 +17,7 @@ import { expoOut } from 'svelte/easing' import { fly } from 'svelte/transition' import SearchBar from '../search/SearchBar.svelte' + import Fixate from '$lib/components/ui/generic/Fixate.svelte' let { data } = $props() @@ -157,10 +158,10 @@ {/if} {#if data.communities.value.length > 0} -
+ `?page=${c}`} /> -
+ {/if} diff --git a/src/routes/profile/(local_user)/password/+layout.svelte b/src/routes/profile/(local_user)/password/+layout.svelte index 09bdc155..c8bbb10c 100644 --- a/src/routes/profile/(local_user)/password/+layout.svelte +++ b/src/routes/profile/(local_user)/password/+layout.svelte @@ -35,9 +35,11 @@
{routes.find(r => page.url.pathname == r.href)?.name ?? $t('routes.profile.credentials')} + {#snippet extended()} + + {/snippet}
-
{:else}