diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-10-07 11:23:30 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-10-07 11:23:30 +0000 |
| commit | cf7fab71036cd72abe6df4d68f7ac499626e27e7 (patch) | |
| tree | 4cd4b9e7f74b5e764ccadc3b768f3b616bfbb7b6 | |
| parent | bb0a7a81c5c5e9947471ccffff629af9ee6d6185 (diff) | |
| parent | bbef4e40dffd012dafed71e6efff5c05e7308c3e (diff) | |
Merge branch 'fix-mute-reasons-whitespaces' into 'develop'
Fix whitespaces for multiple status mute reasons, display bot status reason
See merge request pleroma/pleroma-fe!1948
| -rw-r--r-- | changelog.d/multiple-status-mute-reasons.fix | 1 | ||||
| -rw-r--r-- | src/components/notification/notification.scss | 1 | ||||
| -rw-r--r-- | src/components/status/status.scss | 1 | ||||
| -rw-r--r-- | src/components/status/status.vue | 15 | ||||
| -rw-r--r-- | src/i18n/en.json | 1 |
5 files changed, 15 insertions, 4 deletions
diff --git a/changelog.d/multiple-status-mute-reasons.fix b/changelog.d/multiple-status-mute-reasons.fix new file mode 100644 index 00000000..952ccea8 --- /dev/null +++ b/changelog.d/multiple-status-mute-reasons.fix @@ -0,0 +1 @@ +Fix whitespaces for multiple status mute reasons, display bot status reason diff --git a/src/components/notification/notification.scss b/src/components/notification/notification.scss index 2dbced09..0ca6aea7 100644 --- a/src/components/notification/notification.scss +++ b/src/components/notification/notification.scss @@ -26,6 +26,7 @@ overflow: hidden; display: flex; flex-wrap: nowrap; + gap: 1ex; & .status-username, & .mute-thread, diff --git a/src/components/status/status.scss b/src/components/status/status.scss index 63809ff2..344e4b8e 100644 --- a/src/components/status/status.scss +++ b/src/components/status/status.scss @@ -281,6 +281,7 @@ overflow: hidden; display: flex; flex-wrap: nowrap; + gap: 1ex; & .status-username, & .mute-thread, diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 61a58cda..7fef69df 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -37,16 +37,23 @@ {{ $t('status.sensitive_muted') }} </small> <small - v-if="showReasonMutedThread" + v-if="muteBotStatuses && botStatus" class="mute-thread" > - {{ $t('status.thread_muted') }} + {{ $t('status.bot_muted') }} </small> <small - v-if="showReasonMutedThread && muteWordHits.length > 0" + v-if="showReasonMutedThread" class="mute-thread" > - {{ $t('status.thread_muted_and_words') }} + <span> + {{ $t('status.thread_muted') }} + </span> + <span + v-if="muteWordHits.length > 0" + > + {{ $t('status.thread_muted_and_words') }} + </span> </small> <small class="mute-words" diff --git a/src/i18n/en.json b/src/i18n/en.json index 74cddea8..c86bdbab 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -1151,6 +1151,7 @@ "thread_muted": "Thread muted", "thread_muted_and_words": ", has words:", "sensitive_muted": "Muting sensitive content", + "bot_muted": "Muting bot content", "show_full_subject": "Show full subject", "hide_full_subject": "Hide full subject", "show_content": "Show content", |