qugalet/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-mute-reasons-whitespaces' into 'develop'

Browse source 
Fix whitespaces for multiple status mute reasons, display bot status reason

See merge request pleroma/pleroma-fe!1948
This commit is contained in:
HJ 2024-10-07 11:23:30 +00:00
parent bb0a7a81c5 bbef4e40df
commit cf7fab7103
5 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/multiple-status-mute-reasons.fix Normal file
View file

@ -0,0 +1 @@
Fix whitespaces for multiple status mute reasons, display bot status reason

1
src/components/notification/notification.scss
View file

@ -26,6 +26,7 @@
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
gap: 1ex;
& .status-username, & .status-username,
& .mute-thread, & .mute-thread,

1
src/components/status/status.scss
View file

@ -281,6 +281,7 @@
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
gap: 1ex;
& .status-username, & .status-username,
& .mute-thread, & .mute-thread,

15
src/components/status/status.vue
View file

@ -36,17 +36,24 @@
> >
{{ $t('status.sensitive_muted') }} {{ $t('status.sensitive_muted') }}
</small> </small>
<small
v-if="muteBotStatuses && botStatus"
class="mute-thread"
>
{{ $t('status.bot_muted') }}
</small>
<small <small
v-if="showReasonMutedThread" v-if="showReasonMutedThread"
class="mute-thread" class="mute-thread"
> >
<span>
{{ $t('status.thread_muted') }} {{ $t('status.thread_muted') }}
</small> </span>
<small <span
v-if="showReasonMutedThread && muteWordHits.length > 0" v-if="muteWordHits.length > 0"
class="mute-thread"
> >
{{ $t('status.thread_muted_and_words') }} {{ $t('status.thread_muted_and_words') }}
</span>
</small> </small>
<small <small
class="mute-words" class="mute-words"

1
src/i18n/en.json
View file

@ -1151,6 +1151,7 @@
"thread_muted": "Thread muted", "thread_muted": "Thread muted",
"thread_muted_and_words": ", has words:", "thread_muted_and_words": ", has words:",
"sensitive_muted": "Muting sensitive content", "sensitive_muted": "Muting sensitive content",
"bot_muted": "Muting bot content",
"show_full_subject": "Show full subject", "show_full_subject": "Show full subject",
"hide_full_subject": "Hide full subject", "hide_full_subject": "Hide full subject",
"show_content": "Show content", "show_content": "Show content",