Merge branch 'main' into v0.19.0
This commit is contained in:
commit
c3926efff0
4 files changed
+32
-17
No files matched your search
+1
-1
@@ -44,7 +44,7 @@
|
|||||||
"@dicebear/core": "^6.0.4",
|
"@dicebear/core": "^6.0.4",
|
||||||
"@dicebear/initials": "^6.0.4",
|
"@dicebear/initials": "^6.0.4",
|
||||||
"markdown-it": "^13.0.1",
|
"markdown-it": "^13.0.1",
|
||||||
"mono-svelte": "^0.3.7"
|
"mono-svelte": "^0.4.1"
|
||||||
},
|
},
|
||||||
"type": "module"
|
"type": "module"
|
||||||
}
|
}
|
||||||
@@ -116,7 +116,7 @@
|
|||||||
</Badge>
|
</Badge>
|
||||||
{/if}
|
{/if}
|
||||||
{#if removed}
|
{#if removed}
|
||||||
<Badge label="Removed" color="red">
|
<Badge label="Removed" color="red-subtle">
|
||||||
<Icon src={Trash} mini size="14" />
|
<Icon src={Trash} mini size="14" />
|
||||||
<span class="max-md:hidden">Removed</span>
|
<span class="max-md:hidden">Removed</span>
|
||||||
</Badge>
|
</Badge>
|
||||||
@@ -128,7 +128,7 @@
|
|||||||
</Badge>
|
</Badge>
|
||||||
{/if}
|
{/if}
|
||||||
{#if featured}
|
{#if featured}
|
||||||
<Badge label="Featured" color="green">
|
<Badge label="Featured" color="green-subtle">
|
||||||
<Icon src={Megaphone} mini size="14" />
|
<Icon src={Megaphone} mini size="14" />
|
||||||
<span class="max-md:hidden">Featured</span>
|
<span class="max-md:hidden">Featured</span>
|
||||||
</Badge>
|
</Badge>
|
||||||
|
|||||||
@@ -18,7 +18,14 @@
|
|||||||
} from 'svelte-hero-icons'
|
} from 'svelte-hero-icons'
|
||||||
import PostLink from '$lib/components/lemmy/post/PostLink.svelte'
|
import PostLink from '$lib/components/lemmy/post/PostLink.svelte'
|
||||||
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
|
import PostMeta from '$lib/components/lemmy/post/PostMeta.svelte'
|
||||||
import { Badge, Material, Spinner, removeToast, toast } from 'mono-svelte'
|
import {
|
||||||
|
Badge,
|
||||||
|
Material,
|
||||||
|
Select,
|
||||||
|
Spinner,
|
||||||
|
removeToast,
|
||||||
|
toast,
|
||||||
|
} from 'mono-svelte'
|
||||||
import type { CommentSortType } from 'lemmy-js-client'
|
import type { CommentSortType } from 'lemmy-js-client'
|
||||||
import MultiSelect from '$lib/components/input/Switch.svelte'
|
import MultiSelect from '$lib/components/input/Switch.svelte'
|
||||||
import { profile } from '$lib/auth.js'
|
import { profile } from '$lib/auth.js'
|
||||||
@@ -259,17 +266,25 @@
|
|||||||
<div class="mt-4 flex flex-col gap-2 w-full">
|
<div class="mt-4 flex flex-col gap-2 w-full">
|
||||||
<div class="flex flex-row justify-between flex-wrap gap-2">
|
<div class="flex flex-row justify-between flex-wrap gap-2">
|
||||||
<div class="font-bold opacity-80 text-base flex items-center gap-2">
|
<div class="font-bold opacity-80 text-base flex items-center gap-2">
|
||||||
Comments <Badge color="gray" class="!text-sm">
|
Comments <Badge
|
||||||
|
color="blue-subtle"
|
||||||
|
class="min-w-[1rem] justify-center !font-bold"
|
||||||
|
>
|
||||||
<FormattedNumber number={post.post_view.counts.comments} />
|
<FormattedNumber number={post.post_view.counts.comments} />
|
||||||
</Badge>
|
</Badge>
|
||||||
</div>
|
</div>
|
||||||
<div class="gap-2 flex">
|
<div class="gap-2 flex items-center h-8">
|
||||||
<MultiSelect
|
<Select
|
||||||
options={['Hot', 'Top', 'New']}
|
size="sm"
|
||||||
bind:selected={commentSort}
|
class="!h-full"
|
||||||
on:select={reloadComments}
|
bind:value={commentSort}
|
||||||
headless
|
on:change={reloadComments}
|
||||||
/>
|
>
|
||||||
|
<option value="Hot">Hot</option>
|
||||||
|
<option value="Top">Top</option>
|
||||||
|
<option value="New">New</option>
|
||||||
|
<option value="Old">Old</option>
|
||||||
|
</Select>
|
||||||
<Button size="square-md" on:click={reloadComments}>
|
<Button size="square-md" on:click={reloadComments}>
|
||||||
<Icon src={ArrowPath} size="16" mini slot="prefix" />
|
<Icon src={ArrowPath} size="16" mini slot="prefix" />
|
||||||
</Button>
|
</Button>
|
||||||
@@ -295,9 +310,9 @@
|
|||||||
{:else}
|
{:else}
|
||||||
<Button
|
<Button
|
||||||
on:click={() => (showCreateComment = !showCreateComment)}
|
on:click={() => (showCreateComment = !showCreateComment)}
|
||||||
class="w-max"
|
|
||||||
size="lg"
|
size="lg"
|
||||||
rounding="lg"
|
rounding="lg"
|
||||||
|
color="tertiary"
|
||||||
>
|
>
|
||||||
<Icon src={Plus} size="16" mini slot="prefix" />
|
<Icon src={Plus} size="16" mini slot="prefix" />
|
||||||
Add a comment
|
Add a comment
|
||||||
|
|||||||
@@ -3023,10 +3023,10 @@ mlly@^1.2.0, mlly@^1.4.0:
|
|||||||
pkg-types "^1.0.3"
|
pkg-types "^1.0.3"
|
||||||
ufo "^1.1.2"
|
ufo "^1.1.2"
|
||||||
|
|
||||||
mono-svelte@^0.3.7:
|
mono-svelte@^0.4.1:
|
||||||
version "0.3.7"
|
version "0.4.1"
|
||||||
resolved "https://registry.yarnpkg.com/mono-svelte/-/mono-svelte-0.3.7.tgz#d8100ca072699d672fb951dc33cb9d9f9fb2b60f"
|
resolved "https://registry.yarnpkg.com/mono-svelte/-/mono-svelte-0.4.1.tgz#9237b92aaec435db315967851df651d1650a1936"
|
||||||
integrity sha512-hgxFt7JhaX+jLIQNpbi29XJZ5yuYk3kyCX6sEBsUppxcrT/xqN7ajAm8uXaHg/kSORoiIBR38iHftEMMbeaxgA==
|
integrity sha512-yzDxdQaSJroiL6Yt3qnOIM8thI0d4IB3uOOG0dp/oBemiTtyOBY7niJcXhF0zkU0X/LmarBWYNI8Rs139N2NHw==
|
||||||
dependencies:
|
dependencies:
|
||||||
svelte-focus-trap "^1.2.0"
|
svelte-focus-trap "^1.2.0"
|
||||||
svelte-hero-icons "^5.0.0"
|
svelte-hero-icons "^5.0.0"
|
||||||
|
|||||||
Reference in new issue
Block a user