diff --git a/bun.lockb b/bun.lockb index 82258209..08dbc96d 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 8dbd4f28..faa69dd3 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "@sveltejs/adapter-vercel": "^5.1.0", "@sveltejs/kit": "latest", "@sveltejs/vite-plugin-svelte": "^3.0.0", + "@tailwindcss/container-queries": "^0.1.1", "@types/markdown-it": "^12.2.3", "@types/markdown-it-container": "^2.0.6", "@types/nprogress": "^0.2.0", diff --git a/src/lib/components/lemmy/community/CommunityLink.svelte b/src/lib/components/lemmy/community/CommunityLink.svelte index 49352309..9e7366c1 100644 --- a/src/lib/components/lemmy/community/CommunityLink.svelte +++ b/src/lib/components/lemmy/community/CommunityLink.svelte @@ -13,7 +13,7 @@ @@ -27,18 +27,25 @@ {/if} {#if name} - + + {community.title} {#if showInstance} - {community.title} @{new URL(community.actor_id).hostname} - {:else} - {community.title} {/if} {/if} + + diff --git a/src/lib/components/lemmy/post/PostFeed.svelte b/src/lib/components/lemmy/post/PostFeed.svelte index 847bfd04..9bda3040 100644 --- a/src/lib/components/lemmy/post/PostFeed.svelte +++ b/src/lib/components/lemmy/post/PostFeed.svelte @@ -124,30 +124,30 @@ combinedPosts = combinedPosts.toSpliced(index, 1) }} > - + + {#if viewPost == post.post.id} + + {:else} + + {/if} + {post.crossposts.length} crosspost{post.crossposts.length == + 1 + ? '' + : 's'} + + {/if} + {#if post.withCrossposts && viewPost == post.post.id}
{#if subscribed != undefined && $profile?.jwt}
{/if} {#if community} - + {/if} {#if user} @@ -106,12 +111,11 @@ {/if} {#if published} - + {/if}
{#if badges.nsfw} @@ -192,4 +196,8 @@ grid-template-rows: auto auto auto; grid-template-columns: auto 1fr; } + + .badges:not(:empty) { + padding-top: 0.5rem; + } diff --git a/src/lib/components/lemmy/user/UserLink.svelte b/src/lib/components/lemmy/user/UserLink.svelte index 22285fa9..1367826d 100644 --- a/src/lib/components/lemmy/user/UserLink.svelte +++ b/src/lib/components/lemmy/user/UserLink.svelte @@ -16,20 +16,28 @@ {#if avatar} - + {/if} - + {$userSettings.displayNames ? user.display_name || user.name : user.name} {#if showInstance} @{new URL(user.actor_id).hostname} @@ -48,3 +56,12 @@ {/if} + + diff --git a/src/lib/components/ui/navbar/Navbar.svelte b/src/lib/components/ui/navbar/Navbar.svelte index 85e8b34f..8f3a3ed8 100644 --- a/src/lib/components/ui/navbar/Navbar.svelte +++ b/src/lib/components/ui/navbar/Navbar.svelte @@ -100,7 +100,9 @@
{/if} -
+
{#if $profile?.user && isAdmin($profile.user)}
- - diff --git a/tailwind.config.js b/tailwind.config.js index 7caa0f99..e7892981 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -66,5 +66,5 @@ export default { }, }, }, - plugins: [], + plugins: [require('@tailwindcss/container-queries')], }