diff --git a/src/lib/app/i18n/en.json b/src/lib/app/i18n/en.json index 08e7bcb7..929df57f 100644 --- a/src/lib/app/i18n/en.json +++ b/src/lib/app/i18n/en.json @@ -594,7 +594,8 @@ "results": { "show": "Show results", "hide": "Hide results", - "ends": "Ends {{time}}" + "ends": "Ends {{time}}", + "ended": "Ended {{time}}" }, "choices": "Choices", "single": "Single choice", diff --git a/src/lib/feature/post/PostMeta.svelte b/src/lib/feature/post/PostMeta.svelte index be8f352b..559dfe85 100644 --- a/src/lib/feature/post/PostMeta.svelte +++ b/src/lib/feature/post/PostMeta.svelte @@ -429,12 +429,8 @@ } :global(.badge-tag-color) { - background-color: color-mix( - in oklab, - #eee, - var(--tag-color, #fff) - ) !important; - color: color-mix(in oklab, #000, var(--tag-text-color, #000)) !important; + background-color: var(--tag-color, #fff) !important; + color: var(--tag-text-color, #000) !important; @variant dark { background-color: color-mix( diff --git a/src/lib/feature/post/form/PostForm.svelte b/src/lib/feature/post/form/PostForm.svelte index eb95f5cb..a5c4caa7 100644 --- a/src/lib/feature/post/form/PostForm.svelte +++ b/src/lib/feature/post/form/PostForm.svelte @@ -73,7 +73,7 @@ let uploadImage = $state(false) -{#if client() instanceof PiefedClient} +{#if client() instanceof PiefedClient && !editPost}
() - let chosen = $state() let canVote = $state( !( - post.poll.end_poll && - publishedToDate(post.poll.end_poll).getTime() < Date.now() + (post.poll.end_poll && + publishedToDate(post.poll.end_poll).getTime() < Date.now()) || + !profile.current.jwt ), ) + let chosen = $state(canVote ? undefined : -1) let options = $derived( post.poll.choices.map((i) => ({ diff --git a/src/lib/ui/shared/toast/Toast.svelte b/src/lib/ui/shared/toast/Toast.svelte index 0f23cae8..98ebcab6 100644 --- a/src/lib/ui/shared/toast/Toast.svelte +++ b/src/lib/ui/shared/toast/Toast.svelte @@ -24,7 +24,7 @@