Put poll options behind content warnings#10983
Merged
Gargron merged 4 commits intomastodon:masterfrom Jun 8, 2019
Merged
Conversation
Contributor
Author
Member
|
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... |
Contributor
Author
|
Well, it's not necessary, but it provides meaningful information, as “the poll is an integral part of the status” (can't find it right now but you said something along those lines when we first discussed hiding them)
|
Member
|
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. |
Contributor
Author
|
I guess this is a possibility but that would be *in addition* to mentions, and that would probably be a pain to implement on public pages.
|
4f52730 to
b7192df
Compare
Member
|
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. |
Contributor
Author
|
ok, let me change that |
b7192df to
6e0dae2
Compare
Gargron
approved these changes
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

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
After