Open platform to collect and prioritize feedback
More show post UI changes
Matt Roberts1ba42cf20aa8
diff --git a/locale/de/client.json b/locale/de/client.jsonindex 224d2b270..5e53ace21 100644--- a/locale/de/client.json+++ b/locale/de/client.json@@ -12,6 +12,8 @@"action.save": "Sichern","action.signin": "Anmelden","action.submit": "Absenden",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Erledigt","enum.poststatus.declined": "Abgelehnt","enum.poststatus.deleted": "Gelöscht",@@ -53,6 +55,7 @@"label.description": "Beschreibung","label.discussion": "Diskussion","label.email": "E-Mail",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Buchstabe","label.moderation": "Moderieren",@@ -62,6 +65,7 @@"label.or": "ODER","label.subscribe": "Abonnieren","label.tags": "Tags",+ "label.unfollow": "","label.unread": "Ungelesen","label.unsubscribe": "Abbestellen","label.voters": "Wähler",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Kommentar hinzufügen",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Niemand hat bisher kommentiert.","showpost.label.author": "Gepostet von <0/> · <1/>","showpost.message.nodescription": "Keine Beschreibung angegeben.",diff --git a/locale/el/client.json b/locale/el/client.jsonindex 989f1908c..78aa771f5 100644--- a/locale/el/client.json+++ b/locale/el/client.json@@ -12,6 +12,8 @@"action.save": "Αποθήκευση","action.signin": "Είσοδος","action.submit": "Υποβολή",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Ολοκληρωμένο","enum.poststatus.declined": "Απορρίφθηκε","enum.poststatus.deleted": "Διαγραμμένο",@@ -53,6 +55,7 @@"label.description": "Περιγραφή","label.discussion": "Συζήτηση","label.email": "Email",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Γράμμα","label.moderation": "Εποπτεία",@@ -62,6 +65,7 @@"label.or": "Ή","label.subscribe": "Εγγραφείτε","label.tags": "Ετικέτες",+ "label.unfollow": "","label.unread": "Αδιάβαστο","label.unsubscribe": "Απεγγραφή","label.voters": "Ψηφοφόροι",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Αφήστε ένα σχόλιο",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Κανείς δεν έχει σχολιάσει ακόμα.","showpost.label.author": "Δημοσιεύτηκε από <0/> · <1/>","showpost.message.nodescription": "Δεν υπάρχει περιγραφή.",diff --git a/locale/en/client.json b/locale/en/client.jsonindex 4fd1b1ec6..84d0e73fb 100644--- a/locale/en/client.json+++ b/locale/en/client.json@@ -12,6 +12,8 @@"action.save": "Save","action.signin": "Sign in","action.submit": "Submit",+ "action.vote": "Vote for this idea",+ "action.voted": "Voted!","enum.poststatus.completed": "Completed","enum.poststatus.declined": "Declined","enum.poststatus.deleted": "Deleted",@@ -53,6 +55,7 @@"label.description": "Description","label.discussion": "Discussion","label.email": "Email",+ "label.follow": "Follow","label.gravatar": "Gravatar","label.letter": "Letter","label.moderation": "Moderation",@@ -62,6 +65,7 @@"label.or": "OR","label.subscribe": "Subscribe","label.tags": "Tags",+ "label.unfollow": "Unfollow","label.unread": "Unread","label.unsubscribe": "Unsubscribe","label.voters": "Voters",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Leave a comment",+ "showpost.copylink.success": "Link copied to clipboard","showpost.discussionpanel.emptymessage": "No one has commented yet.","showpost.label.author": "Posted by <0/> · <1/>","showpost.message.nodescription": "No description provided.",diff --git a/locale/es-ES/client.json b/locale/es-ES/client.jsonindex 913858665..d7ef35157 100644--- a/locale/es-ES/client.json+++ b/locale/es-ES/client.json@@ -12,6 +12,8 @@"action.save": "Guardar","action.signin": "Iniciar sesión","action.submit": "Enviar",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Completado","enum.poststatus.declined": "Rechazado","enum.poststatus.deleted": "Eliminado",@@ -53,6 +55,7 @@"label.description": "Descripción","label.discussion": "Discusión","label.email": "Correo electrónico",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Letras","label.moderation": "Moderación",@@ -62,6 +65,7 @@"label.or": "O","label.subscribe": "Suscribete","label.tags": "Etiquetas",+ "label.unfollow": "","label.unread": "Sin leer","label.unsubscribe": "Cancelar la suscripción","label.voters": "Votantes",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Publica un comentario",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Nadie ha comentado todavía.","showpost.label.author": "Publicado por <0/> · <1/>","showpost.message.nodescription": "No se proporcionó ninguna descripción.",diff --git a/locale/fr/client.json b/locale/fr/client.jsonindex 02a0042bf..2c697b28b 100644--- a/locale/fr/client.json+++ b/locale/fr/client.json@@ -12,6 +12,8 @@"action.save": "Enregistrer","action.signin": "Se connecter","action.submit": "Valider",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Terminé","enum.poststatus.declined": "Refusé","enum.poststatus.deleted": "Supprimé",@@ -53,6 +55,7 @@"label.description": "Description","label.discussion": "Discussion","label.email": "E-mail",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Lettre","label.moderation": "Modération",@@ -62,6 +65,7 @@"label.or": "OU","label.subscribe": "S'abonner","label.tags": "Tags",+ "label.unfollow": "","label.unread": "Non lu","label.unsubscribe": "Se désabonner","label.voters": "Votants",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Rédiger un commentaire",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Personne n'a encore commenté.","showpost.label.author": "Posté par <0/> · <1/>","showpost.message.nodescription": "Aucune description fournie.",diff --git a/locale/it/client.json b/locale/it/client.jsonindex 6cdc00e80..0714e6b60 100644--- a/locale/it/client.json+++ b/locale/it/client.json@@ -12,6 +12,8 @@"action.save": "Salva","action.signin": "Accedi","action.submit": "Invia",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Completato","enum.poststatus.declined": "Rifiutato","enum.poststatus.deleted": "Eliminato",@@ -53,6 +55,7 @@"label.description": "Descrizione","label.discussion": "Discussione","label.email": "Email",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Lettera","label.moderation": "Moderazione",@@ -62,6 +65,7 @@"label.or": "OPPURE","label.subscribe": "Abbonati","label.tags": "Tags",+ "label.unfollow": "","label.unread": "Non letto","label.unsubscribe": "Disiscriversi","label.voters": "Votanti",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Lascia un commento",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Nessuno ha ancora commentato.","showpost.label.author": "Scritto da <0/>·<1/>","showpost.message.nodescription": "Nessuna descrizione fornita.",diff --git a/locale/nl/client.json b/locale/nl/client.jsonindex 4bf20bb08..77827a9dc 100644--- a/locale/nl/client.json+++ b/locale/nl/client.json@@ -12,6 +12,8 @@"action.save": "Opslaan","action.signin": "Inloggen","action.submit": "Verzenden",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Voltooid","enum.poststatus.declined": "Afgewezen","enum.poststatus.deleted": "Verwijderd",@@ -53,6 +55,7 @@"label.description": "Omschrijving","label.discussion": "Discussie","label.email": "E-mailadres",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Initialen","label.moderation": "Moderatie",@@ -62,6 +65,7 @@"label.or": "OF","label.subscribe": "Abonneren","label.tags": "Labels",+ "label.unfollow": "","label.unread": "Ongelezen","label.unsubscribe": "Uitschrijven","label.voters": "Stemmers",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Laat een reactie achter",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Nog niemand heeft gereageerd.","showpost.label.author": "Geplaatst door <0/> · <1/>","showpost.message.nodescription": "Geen omschrijving opgegeven.",diff --git a/locale/pl/client.json b/locale/pl/client.jsonindex 95f4bc633..22a91174c 100644--- a/locale/pl/client.json+++ b/locale/pl/client.json@@ -12,6 +12,8 @@"action.save": "Zapisz","action.signin": "Zaloguj się","action.submit": "Prześlij",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Ukończone","enum.poststatus.declined": "Odrzucone","enum.poststatus.deleted": "Usunięte",@@ -53,6 +55,7 @@"label.description": "Opis","label.discussion": "Dyskusja","label.email": "Email",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Litera","label.moderation": "Moderacja",@@ -62,6 +65,7 @@"label.or": "LUB","label.subscribe": "Subskrybuj","label.tags": "Tagi",+ "label.unfollow": "","label.unread": "Nieprzeczytane","label.unsubscribe": "Zrezygnuj z subskrypcji","label.voters": "Głosujący",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Skomentuj",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Wygląda na to, że nikt jeszcze nie skomentował.","showpost.label.author": "Wysłane przez <0/> · <1/>","showpost.message.nodescription": "Brak opisu.",diff --git a/locale/pt-BR/client.json b/locale/pt-BR/client.jsonindex 440941a39..55ea8ce5f 100644--- a/locale/pt-BR/client.json+++ b/locale/pt-BR/client.json@@ -12,6 +12,8 @@"action.save": "Salvar","action.signin": "Iniciar sessão","action.submit": "Enviar",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Completado","enum.poststatus.declined": "Rejeitado","enum.poststatus.deleted": "Removido",@@ -53,6 +55,7 @@"label.description": "Descrição","label.discussion": "Discussão","label.email": "E-mail",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Letra","label.moderation": "Moderação",@@ -62,6 +65,7 @@"label.or": "OU","label.subscribe": "Inscrever-se","label.tags": "Tags",+ "label.unfollow": "","label.unread": "Não lidas","label.unsubscribe": "Desinscrever-se","label.voters": "Votantes",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Deixe um comentário",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Ninguém comentou ainda.","showpost.label.author": "Publicado por <0/> · <1/>","showpost.message.nodescription": "Nenhuma descrição fornecida.",diff --git a/locale/ru/client.json b/locale/ru/client.jsonindex b13fb1882..dd94ed2ed 100644--- a/locale/ru/client.json+++ b/locale/ru/client.json@@ -12,6 +12,8 @@"action.save": "Сохранить","action.signin": "Войти","action.submit": "Продолжить",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Выполнено","enum.poststatus.declined": "Отклонено","enum.poststatus.deleted": "Удалено",@@ -53,6 +55,7 @@"label.description": "Описание","label.discussion": "Обсуждение","label.email": "Адрес электронной почты",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Буквенный","label.moderation": "Модерация",@@ -62,6 +65,7 @@"label.or": "ИЛИ","label.subscribe": "Подписаться","label.tags": "Теги",+ "label.unfollow": "","label.unread": "Непрочитанные","label.unsubscribe": "Отписаться","label.voters": "Проголосовавшие",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Ссылка на комментарий скопирована в буфер","showpost.comment.unknownhighlighted": "Некорректный ID комментария #{id}","showpost.commentinput.placeholder": "Оставить комментарий",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Комментариев нет.","showpost.label.author": "Создал <0/> · <1/>","showpost.message.nodescription": "Описания нет.",diff --git a/locale/sk/client.json b/locale/sk/client.jsonindex 5224b9fb8..b9d59d137 100644--- a/locale/sk/client.json+++ b/locale/sk/client.json@@ -12,6 +12,8 @@"action.save": "Uložiť","action.signin": "Prihlásiť sa","action.submit": "Potvrdiť",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Dokončené","enum.poststatus.declined": "Odmietnuté","enum.poststatus.deleted": "Vymazané",@@ -53,6 +55,7 @@"label.description": "Popis","label.discussion": "Diskusia","label.email": "Email",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Písmeno","label.moderation": "Správca",@@ -62,6 +65,7 @@"label.or": "ALEBO","label.subscribe": "Prihlásiť sa k odberu","label.tags": "Značky",+ "label.unfollow": "","label.unread": "Neprečítané","label.unsubscribe": "Zrušiť odber","label.voters": "Hlasujúci",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Zanechať komentár",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Zatiaľ sa nikto nevyjadril.","showpost.label.author": "Pridané <0/> · <1/>","showpost.message.nodescription": "Nie je poskytnutý žiadny popis.",diff --git a/locale/sv-SE/client.json b/locale/sv-SE/client.jsonindex a8ecfb7c9..fa2de6203 100644--- a/locale/sv-SE/client.json+++ b/locale/sv-SE/client.json@@ -12,6 +12,8 @@"action.save": "Spara","action.signin": "Logga in","action.submit": "Skicka",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Avslutad","enum.poststatus.declined": "Nekad","enum.poststatus.deleted": "Borttagen",@@ -53,6 +55,7 @@"label.description": "Beskrivning","label.discussion": "Diskussion","label.email": "E-post",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Bokstav","label.moderation": "Moderering",@@ -62,6 +65,7 @@"label.or": "ELLER","label.subscribe": "Prenumerera","label.tags": "Etiketter",+ "label.unfollow": "","label.unread": "Olästa","label.unsubscribe": "Avsluta prenumeration","label.voters": "Röstande",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Skriv en kommentar",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Ingen har kommenterat ännu.","showpost.label.author": "Skriven av <0/> · <1/>","showpost.message.nodescription": "Ingen beskrivning angiven.",diff --git a/locale/tr/client.json b/locale/tr/client.jsonindex bc7a3904f..6c1ff5507 100644--- a/locale/tr/client.json+++ b/locale/tr/client.json@@ -12,6 +12,8 @@"action.save": "Kaydet","action.signin": "Giriş Yap","action.submit": "Gönder",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "Tamamlandı","enum.poststatus.declined": "Reddedildi","enum.poststatus.deleted": "Silindi",@@ -53,6 +55,7 @@"label.description": "Açıklama","label.discussion": "Tartışma","label.email": "E-Posta",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "Harf","label.moderation": "Moderasyon",@@ -62,6 +65,7 @@"label.or": "VEYA","label.subscribe": "Abone ol","label.tags": "Etiketler",+ "label.unfollow": "","label.unread": "Okunmamış","label.unsubscribe": "Abonelikten çık","label.voters": "Oy verenler",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "Comment link copied to clipboard","showpost.comment.unknownhighlighted": "Invalid comment ID #{id}","showpost.commentinput.placeholder": "Yorum yazın",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "Henüz hiç kimse yorum yapmadı.","showpost.label.author": "<0/> · <1/> tarafından gönderildi","showpost.message.nodescription": "Herhangi bir açıklama belirtilmedi.",diff --git a/locale/zh-CN/client.json b/locale/zh-CN/client.jsonindex 951d84ac9..5f1294875 100644--- a/locale/zh-CN/client.json+++ b/locale/zh-CN/client.json@@ -12,6 +12,8 @@"action.save": "保存","action.signin": "登录","action.submit": "提交",+ "action.vote": "",+ "action.voted": "","enum.poststatus.completed": "完成","enum.poststatus.declined": "拒绝","enum.poststatus.deleted": "删除",@@ -53,6 +55,7 @@"label.description": "说明","label.discussion": "讨论","label.email": "邮箱",+ "label.follow": "","label.gravatar": "Gravatar","label.letter": "稍后","label.moderation": "管理",@@ -62,6 +65,7 @@"label.or": "或者","label.subscribe": "订阅","label.tags": "标签",+ "label.unfollow": "","label.unread": "未读","label.unsubscribe": "取消订阅","label.voters": "投票者",@@ -135,6 +139,7 @@"showpost.comment.copylink.success": "评论链接已复制到剪贴板","showpost.comment.unknownhighlighted": "无效的评论ID #{id}","showpost.commentinput.placeholder": "发表评论",+ "showpost.copylink.success": "","showpost.discussionpanel.emptymessage": "还没有人发表评论.","showpost.label.author": "发表者 <0/> · <1/>","showpost.message.nodescription": "未提供描述.",diff --git a/public/assets/images/heroicons-duplicate.svg b/public/assets/images/heroicons-duplicate.svgnew file mode 100644index 000000000..bf48f9fec--- /dev/null+++ b/public/assets/images/heroicons-duplicate.svg@@ -0,0 +1,3 @@+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">+ <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 17.25v3.375c0 .621-.504 1.125-1.125 1.125h-9.75a1.125 1.125 0 0 1-1.125-1.125V7.875c0-.621.504-1.125 1.125-1.125H6.75a9.06 9.06 0 0 1 1.5.124m7.5 10.376h3.375c.621 0 1.125-.504 1.125-1.125V11.25c0-4.46-3.243-8.161-7.5-8.876a9.06 9.06 0 0 0-1.5-.124H9.375c-.621 0-1.125.504-1.125 1.125v3.5m7.5 10.375H9.375a1.125 1.125 0 0 1-1.125-1.125v-9.25m12 6.625v-1.875a3.375 3.375 0 0 0-3.375-3.375h-1.5a1.125 1.125 0 0 1-1.125-1.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H9.75" />+</svg>diff --git a/public/components/ShowPostResponse.tsx b/public/components/ShowPostResponse.tsxindex 8769d04cc..50db95462 100644--- a/public/components/ShowPostResponse.tsx+++ b/public/components/ShowPostResponse.tsx@@ -1,6 +1,7 @@import React from "react"import { PostResponse, PostStatus } from "@fider/models"-import { Markdown, UserName, ShowPostStatus } from "@fider/components"+import { Icon, Markdown } from "@fider/components"+import HeroIconDuplicate from "@fider/assets/images/heroicons-duplicate.svg"import { HStack } from "./layout"const DuplicateDetails = (props: PostResponseProps): JSX.Element | null => {@@ -14,12 +15,12 @@ const DuplicateDetails = (props: PostResponseProps): JSX.Element | null => {}return (- <div className="content">- <span>↪</span>{" "}+ <HStack>+ <Icon sprite={HeroIconDuplicate} className="h-6 text-gray-500" /><a className="text-link" href={`/posts/${original.number}/${original.slug}`}>{original.title}</a>- </div>+ </HStack>)}@@ -45,14 +46,9 @@ export const ShowPostResponse = (props: PostResponseProps): JSX.Element | null =if (props.response && (status.show || props.response.text)) {return (- <div className="p-2 shadow rounded">- <HStack>- {status.show && <ShowPostStatus status={status} />}- <span className="text-xs">- · <UserName user={props.response.user} />- </span>- </HStack>- {status === PostStatus.Duplicate ? DuplicateDetails(props) : StatusDetails(props)}+ <div>+ {status.show && <div className={`p-2 text-white text-center text-semibold c-status-bg--${status.value}`}>{status.title}</div>}+ <div className="pt-2">{status === PostStatus.Duplicate ? DuplicateDetails(props) : StatusDetails(props)}</div></div>)}diff --git a/public/components/ShowPostStatus.scss b/public/components/ShowPostStatus.scssindex 8702d7022..7f82d9e3e 100644--- a/public/components/ShowPostStatus.scss+++ b/public/components/ShowPostStatus.scss@@ -1,31 +1,28 @@@import "~@fider/assets/styles/variables.scss";-.c-status-label {- text-transform: uppercase;- font-weight: 600;- font-size: 11px;+.c-status-bg {&--open {- color: get("colors.gray.900");+ background-color: get("colors.gray.900");}&--planned {- color: #6435c9;+ background-color: #6435c9;}&--started {- color: #2185d0;+ background-color: #2185d0;}&--completed {- color: #21ba45;+ background-color: #21ba45;}&--declined {- color: #db2828;+ background-color: #db2828;}&--duplicate {- color: #d6a100;+ background-color: #d6a100;}}diff --git a/public/components/ShowTag.tsx b/public/components/ShowTag.tsxindex aa0ea2f9b..b3b87114c 100644--- a/public/components/ShowTag.tsx+++ b/public/components/ShowTag.tsx@@ -34,6 +34,16 @@ export const ShowTag = (props: TagProps) => {"c-tag--circular": props.circular === true,})+ const darkenColor = (color: string) => {+ const components = getRGB(color)+ const darkerR = Math.floor(components.R * 0.8)+ const darkerG = Math.floor(components.G * 0.8)+ const darkerB = Math.floor(components.B * 0.8)+ return `${darkerR.toString(16).padStart(2, "0")}${darkerG.toString(16).padStart(2, "0")}${darkerB.toString(16).padStart(2, "0")}`+ }++ const darkerColor = darkenColor(props.tag.color)+return (<ahref={props.link && props.tag.slug ? `/?tags=${props.tag.slug}` : undefined}@@ -41,6 +51,7 @@ export const ShowTag = (props: TagProps) => {className={className}style={{backgroundColor: `#${props.tag.color}`,+ border: `1px solid #${darkerColor}`,color: textColor(props.tag.color),}}>diff --git a/public/components/common/Button.scss b/public/components/common/Button.scssindex f8d5ba528..58f8b99ee 100644--- a/public/components/common/Button.scss+++ b/public/components/common/Button.scss@@ -31,7 +31,7 @@}&--quaternary {- color: get("colors.gray.900");+ // color: get("colors.gray.900");background-color: transparent;border: 1px solid get("colors.primary.base");diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsxindex 91b2984c2..350b1f216 100644--- a/public/pages/ShowPost/ShowPost.page.tsx+++ b/public/pages/ShowPost/ShowPost.page.tsx@@ -246,7 +246,6 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho<NotificationsPanel2 post={this.props.post} subscribed={this.props.subscribed} /></HStack>)}- <ShowPostResponse status={this.props.post.status} response={this.props.post.response} /><VStack>{this.state.editMode ? (<Form error={this.state.error}>@@ -267,27 +266,29 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho</>)}</VStack>+ <ShowPostResponse status={this.props.post.status} response={this.props.post.response} />- {!this.state.editMode ? (- <VoteSection post={this.props.post} votes={this.props.votes} />- ) : (- <HStack>- <Button variant="primary" onClick={this.saveChanges} disabled={Fider.isReadOnly}>- <Icon sprite={IconThumbsUp} />{" "}- <span>- <Trans id="action.save">Save</Trans>- </span>- </Button>- <Button onClick={this.cancelEdit} disabled={Fider.isReadOnly}>- <Icon sprite={IconX} />- <span>- <Trans id="action.cancel">Cancel</Trans>- </span>- </Button>- </HStack>- )}-- <div className="purple-border" />+ <VStack spacing={4}>+ {!this.state.editMode ? (+ <VoteSection post={this.props.post} votes={this.props.votes} />+ ) : (+ <HStack>+ <Button variant="primary" onClick={this.saveChanges} disabled={Fider.isReadOnly}>+ <Icon sprite={IconThumbsUp} />{" "}+ <span>+ <Trans id="action.save">Save</Trans>+ </span>+ </Button>+ <Button onClick={this.cancelEdit} disabled={Fider.isReadOnly}>+ <Icon sprite={IconX} />+ <span>+ <Trans id="action.cancel">Cancel</Trans>+ </span>+ </Button>+ </HStack>+ )}+ <div className="purple-border" />+ </VStack></VStack></div>diff --git a/public/pages/ShowPost/components/TagsPanel2.tsx b/public/pages/ShowPost/components/TagsPanel2.tsxindex e85f7e031..89266cb56 100644--- a/public/pages/ShowPost/components/TagsPanel2.tsx+++ b/public/pages/ShowPost/components/TagsPanel2.tsx@@ -52,7 +52,12 @@ export const TagsPanel2 = (props: TagsPanelProps) => {{assignedTags.length > 0 && assignedTags.map((tag) => <ShowTag key={tag.id} tag={tag} link />)}<HStack spacing={1} center={true} className="clickable" onClick={onSubtitleClick}><Icon sprite={IconPlusCircle} className="h-5 text-primary" />- <span>Edit Tags</span>++ {assignedTags.length === 0 && (+ <span>+ <Trans id="label.tags">Tags</Trans>+ </span>+ )}</HStack></HStack>)