Skip to content

Compact content warnings #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Steffo99 wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Compact content warnings #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e116d16
Move spoiler text to inside the button
Steffo99 Sep 23, 2024
0d60b22
Tweak post spoiler style
Steffo99 Sep 23, 2024
efc1191
Maybe a plain button would be best?
Steffo99 Sep 23, 2024
4c57c6a
Oops
Steffo99 Sep 23, 2024
4570ff6
Merge branch 'main' into feature/smaller-spoiler
Steffo99 Dec 9, 2024
0d1e19f
Localization
Steffo99 Dec 9, 2024
d9bfb30
Run prettier
Steffo99 Dec 9, 2024
cdd68e2
Merge branch 'main' into feature/smaller-spoiler
Steffo99 Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/components/status.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,10 @@
padding-bottom: 10px;
}

:is(.spoiler-button, .spoiler-media-button) .spoiler-text {
word-wrap: anywhere;
}

.status
.content-container.has-spoiler
:is(.spoiler-button, .spoiler-media-button):not([hidden]) {
Expand Down
48 changes: 22 additions & 26 deletions src/components/status.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2450,21 +2450,12 @@ function Status({
<>
{(!!spoilerText || !!sensitive) && !readingExpandSpoilers && (
<>
{!!spoilerText && (
<span
class="spoiler-content media-first-spoiler-content"
lang={language}
dir="auto"
ref={spoilerContentRef}
data-read-more={_(readMoreText)}
>
<EmojiText text={spoilerText} emojis={emojis} />{' '}
</span>
)}
<button
class={`light spoiler-button media-first-spoiler-button ${
class={`plain spoiler-button media-first-spoiler-button ${
showSpoiler ? 'spoiling' : ''
}`}
lang={language}
dir="auto"
type="button"
onClick={(e) => {
e.preventDefault();
Expand All @@ -2483,7 +2474,15 @@ function Status({
}}
>
<Icon icon={showSpoiler ? 'eye-open' : 'eye-close'} />{' '}
{showSpoiler ? t`Show less` : t`Show content`}
<span class={'spoiler-text'}>
{spoilerText ? (
<EmojiText text={spoilerText} emojis={emojis} />
) : showSpoiler ? (
t`Show less`
) : (
t`Show content`
)}
</span>
</button>
</>
)}
Expand All @@ -2507,24 +2506,13 @@ function Status({
<>
{!!spoilerText && (
<>
<div
class="content spoiler-content"
lang={language}
dir="auto"
ref={spoilerContentRef}
data-read-more={_(readMoreText)}
>
<p>
<EmojiText text={spoilerText} emojis={emojis} />
</p>
</div>
{readingExpandSpoilers || previewMode ? (
<div class="spoiler-divider">
<Icon icon="eye-open" /> <Trans>Content warning</Trans>
</div>
) : (
<button
class={`light spoiler-button ${
class={`plain spoiler-button ${
showSpoiler ? 'spoiling' : ''
}`}
type="button"
Expand All @@ -2545,7 +2533,15 @@ function Status({
}}
>
<Icon icon={showSpoiler ? 'eye-open' : 'eye-close'} />{' '}
{showSpoiler ? t`Show less` : t`Show content`}
<span class={'spoiler-text'}>
{!!spoilerText ? (
<EmojiText text={spoilerText} emojis={emojis} />
) : showSpoiler ? (
t`Show less`
) : (
t`Show content`
)}
</span>
</button>
)}
</>
Expand Down
Loading
Loading