Skip to content

Put poll options behind content warnings#10983

Merged
Gargron merged 4 commits intomastodon:masterfrom
ClearlyClaire:features/polls-behind-cws
Jun 8, 2019
Merged

Put poll options behind content warnings#10983
Gargron merged 4 commits intomastodon:masterfrom
ClearlyClaire:features/polls-behind-cws

Conversation

@ClearlyClaire
Copy link
Copy Markdown
Contributor

@ClearlyClaire ClearlyClaire commented Jun 6, 2019

This moves the whole poll component behind content warnings, in a similar way to what glitch-soc does, but it does not move media components there.

Public pages behave in the same way but don't have the poll icon added yet, because the event handling is more tricky.

Before

image

After

image

@ClearlyClaire
Copy link
Copy Markdown
Contributor Author

Added the icon to the public pages

image

This also fixes the styling of the CW to be the same as in the WebUI (button VS a)

@ClearlyClaire ClearlyClaire requested a review from Gargron June 6, 2019 15:26
@Gargron
Copy link
Copy Markdown
Member

Gargron commented Jun 6, 2019

Realistically is there any point in adding a new icon inside the show more button? GlitchSoc has that convention because you hide images behind that as well, but in upstream this would be a new precedent and I'm not sure it's actually necessary...

@ClearlyClaire
Copy link
Copy Markdown
Contributor Author

ClearlyClaire commented Jun 6, 2019 via email

@Gargron
Copy link
Copy Markdown
Member

Gargron commented Jun 6, 2019

That is true, I just feel like that icon is way too tight in there. An alternative idea could be writing "Poll attached" in the same style as "Show thread", there is precedent for previewing hidden content on a separate line like with mentions.

@ClearlyClaire
Copy link
Copy Markdown
Contributor Author

ClearlyClaire commented Jun 6, 2019 via email

@Gargron
Copy link
Copy Markdown
Member

Gargron commented Jun 8, 2019

I'd be more comfortable merging this right now if it didn't change how the "show more" button looked. It can always be adjusted later if need arises.

@ClearlyClaire
Copy link
Copy Markdown
Contributor Author

ok, let me change that

@ClearlyClaire ClearlyClaire force-pushed the features/polls-behind-cws branch from b7192df to 6e0dae2 Compare June 8, 2019 15:01
@Gargron Gargron merged commit e9ddd5a into mastodon:master Jun 8, 2019
hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
messenjahofchrist pushed a commit to Origin-Creative/mastodon that referenced this pull request Jul 30, 2021
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants