2
0

Improve display of content warnings in Admin UI (#35935)

This commit is contained in:
Emelia Smith
2025-10-10 10:55:41 +02:00
committed by GitHub
parent 81350c7cfb
commit 8898f120dc
3 changed files with 55 additions and 5 deletions

View File

@@ -1946,7 +1946,6 @@ a.sparkline {
.status__card { .status__card {
padding: 15px; padding: 15px;
border-radius: 4px; border-radius: 4px;
background: $ui-base-color;
font-size: 15px; font-size: 15px;
line-height: 20px; line-height: 20px;
word-wrap: break-word; word-wrap: break-word;
@@ -1965,8 +1964,50 @@ a.sparkline {
.status__content { .status__content {
padding-top: 0; padding-top: 0;
summary { > details {
display: list-item; summary {
display: block;
box-sizing: border-box;
background: var(--nested-card-background);
color: var(--nested-card-text);
border: var(--nested-card-border);
border-radius: 8px;
padding: 8px 13px;
position: relative;
font-size: 15px;
line-height: 22px;
cursor: pointer;
&::after {
content: attr(data-show, 'Show more');
margin-top: 8px;
display: block;
font-size: 15px;
line-height: 20px;
color: $highlight-text-color;
cursor: pointer;
border: 0;
background: transparent;
padding: 0;
text-decoration: none;
font-weight: 500;
}
&:hover,
&:focus-visible {
&::after {
text-decoration: underline !important;
}
}
}
&[open] summary {
margin-bottom: 16px;
&::after {
content: attr(data-hide, 'Hide post');
}
}
} }
} }

View File

@@ -1,8 +1,14 @@
.status__content>< .status__content><
- if status.spoiler_text.present? - if status.spoiler_text.present?
%details< %details<
%summary>< %summary{
%strong> Content warning: #{prerender_custom_emojis(h(status.spoiler_text), status.emojis)} data: {
show: t('statuses.content_warnings.show'),
hide: t('statuses.content_warnings.hide'),
}
}><
%strong>
= prerender_custom_emojis(h(status.spoiler_text), status.emojis)
= prerender_custom_emojis(status_content_format(status), status.emojis) = prerender_custom_emojis(status_content_format(status), status.emojis)
= render partial: 'admin/shared/status_attachments', locals: { status: status.proper } = render partial: 'admin/shared/status_attachments', locals: { status: status.proper }
- else - else

View File

@@ -1909,6 +1909,9 @@ en:
other: "%{count} videos" other: "%{count} videos"
boosted_from_html: Boosted from %{acct_link} boosted_from_html: Boosted from %{acct_link}
content_warning: 'Content warning: %{warning}' content_warning: 'Content warning: %{warning}'
content_warnings:
hide: Hide post
show: Show more
default_language: Same as interface language default_language: Same as interface language
disallowed_hashtags: disallowed_hashtags:
one: 'contained a disallowed hashtag: %{tags}' one: 'contained a disallowed hashtag: %{tags}'