diff --git a/package.json b/package.json index 1632bcca..d5003b05 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@dicebear/initials": "^6.0.4", "lemmy-js-client": "^0.18.0-rc.2", "markdown-it": "^13.0.1", - "mono-svelte": "^0.3.2" + "mono-svelte": "^0.3.3" }, "type": "module" } diff --git a/src/lib/components/lemmy/post/Post.svelte b/src/lib/components/lemmy/post/Post.svelte index 5641b251..0e78a320 100644 --- a/src/lib/components/lemmy/post/Post.svelte +++ b/src/lib/components/lemmy/post/Post.svelte @@ -30,142 +30,144 @@ > -
-
+
+
+
- + {#if $userSettings.view == 'card'} + {#if isImage(post.post.url)} + + - - -
- {#if $userSettings.view == 'card'} - {#if isImage(post.post.url)} - - - - - - - - (loaded = true)} - /> - - - - {:else if post.post.url} - - {/if} + + + + (loaded = true)} + /> + + + + {:else if post.post.url} + {/if} - {#if post.post.body && !post.post.nsfw && (view == 'list' || view == 'card')} -
- - {#if post.post.body.length > (view == 'list' ? 200 : 600)} -
+ + {#if post.post.body.length > (view == 'list' ? 200 : 600)} +
- {/if} -
- {/if} -
- {#if ($userSettings.view == 'list' || $userSettings.view == 'compact') && (post.post.thumbnail_url || isImage(post.post.url))} -
- {#if !$userSettings.expandImages || (post.post.thumbnail_url && !isImage(post.post.url))} - - - - - {:else} - - - - + : 'dark:from-zinc-900/0 dark:to-zinc-900 from-white/0 to-white'}" + /> {/if}
{/if}
- {#if actions} -
- { - toast({ - content: 'The post was edited successfully.', - type: 'success', - }) - }} - /> + {#if ($userSettings.view == 'list' || $userSettings.view == 'compact') && (post.post.thumbnail_url || isImage(post.post.url))} +
+ {#if !$userSettings.expandImages || (post.post.thumbnail_url && !isImage(post.post.url))} + + + + + {:else} + + + + + {/if}
{/if}
+ {#if actions} +
+ { + toast({ + content: 'The post was edited successfully.', + type: 'success', + }) + }} + /> +
+ {/if} diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte index 6daf1d1c..8fbe3447 100644 --- a/src/lib/components/lemmy/post/PostActions.svelte +++ b/src/lib/components/lemmy/post/PostActions.svelte @@ -7,6 +7,7 @@ Bookmark, BookmarkSlash, BugAnt, + ChatBubbleOvalLeft, ChatBubbleOvalLeftEllipsis, EllipsisHorizontal, Eye, @@ -75,12 +76,10 @@ {/if} -
+
@@ -89,7 +88,7 @@ href="/post/{getInstance()}/{post.post.id}" class="!text-inherit h-8 px-3" > - +
diff --git a/src/lib/components/lemmy/post/PostFeed.svelte b/src/lib/components/lemmy/post/PostFeed.svelte index c48fa2e0..751e6a78 100644 --- a/src/lib/components/lemmy/post/PostFeed.svelte +++ b/src/lib/components/lemmy/post/PostFeed.svelte @@ -13,7 +13,7 @@
diff --git a/src/lib/components/lemmy/post/PostVote.svelte b/src/lib/components/lemmy/post/PostVote.svelte index f3f6610f..02eedba4 100644 --- a/src/lib/components/lemmy/post/PostVote.svelte +++ b/src/lib/components/lemmy/post/PostVote.svelte @@ -13,12 +13,10 @@ } from 'svelte-hero-icons' import { profile } from '$lib/auth.js' import { vote as voteItem } from '$lib/lemmy/contentview.js' - import { Button, Popover } from 'mono-svelte' + import { Button, Material, Popover } from 'mono-svelte' export let post: Post export let vote: number = 0 - export let upvotes: number = 0 - export let downvotes: number = 0 export let score: number const voteColor = (vote: number, border: boolean = false) => @@ -26,54 +24,39 @@ - -
+ - - - - -
-
- - - - - - - - -
-
+ + + + + + +
diff --git a/tailwind.config.js b/tailwind.config.js index d92cdc44..165e6998 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -23,6 +23,7 @@ export default { }, colors: { slate: { + 200: '#e8edf4', 25: 'rgb(252,253,254)', }, zinc: { diff --git a/yarn.lock b/yarn.lock index f6019091..83cb49ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3023,10 +3023,10 @@ mlly@^1.2.0, mlly@^1.4.0: pkg-types "^1.0.3" ufo "^1.1.2" -mono-svelte@^0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/mono-svelte/-/mono-svelte-0.3.2.tgz#646a247698b7aac4cd8c6c0d03ad448081e6b310" - integrity sha512-CiJzyCtQ6xM8XXhowyqIqCp8R4Q7IVDHbg7Ly+W5QSjfaBRYFbv2L/qhi0FkvBzQ6WOSoCK8Lz0vN81WbaPbyA== +mono-svelte@^0.3.3: + version "0.3.3" + resolved "https://registry.yarnpkg.com/mono-svelte/-/mono-svelte-0.3.3.tgz#001a4f0d95f4a33f7bb0c7e3b5681eb1ff21eabd" + integrity sha512-EmGgBESe0YiVAbolHFZ+/JWiAnqPqcwhJS1kNQCJjoSEY1VDPxswkZQ60yJHZad34U6jaYbRZRU2Mop1Xa7eYA== mri@^1.1.0: version "1.2.0"