mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2025-01-19 11:54:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Swap position of media attachments and polls"

Browse source 
This reverts commit bb12af7250.

I do not like that commit - I am used to the buttons being this way.
Besides, this would deviate from vanilla Mastodon needlessly.
This commit is contained in:
Jeremy Kescher 2022-04-22 18:21:41 +02:00
parent 612ff1714a
commit 667c407893
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/javascript/flavours/glitch/components/status.js
View file

@ -581,7 +581,10 @@ class Status extends ImmutablePureComponent {
// backgrounds for collapsed statuses are enabled.
attachments = status.get('media_attachments');
if (status.get('poll')) {
media.push(<PollContainer pollId={status.get('poll')} />);
mediaIcons.push('tasks');
}
if (usingPiP) {
media.push(<PictureInPicturePlaceholder width={this.props.cachedMediaWidth} />);
mediaIcons.push('video-camera');
@ -681,11 +684,6 @@ class Status extends ImmutablePureComponent {
mediaIcons.push('link');
}
if (status.get('poll')) {
media.push(<PollContainer pollId={status.get('poll')} />);
mediaIcons.push('tasks');
}
// Here we prepare extra data-* attributes for CSS selectors.
// Users can use those for theming, hiding avatars etc via UserStyle
const selectorAttribs = {

9
app/javascript/flavours/glitch/features/status/components/detailed_status.js
View file

@ -134,6 +134,10 @@ class DetailedStatus extends ImmutablePureComponent {
outerStyle.height = `${this.state.height}px`;
}
if (status.get('poll')) {
media.push(<PollContainer pollId={status.get('poll')} />);
mediaIcons.push('tasks');
}
if (usingPiP) {
media.push(<PictureInPicturePlaceholder />);
mediaIcons.push('video-camera');
@ -198,11 +202,6 @@ class DetailedStatus extends ImmutablePureComponent {
mediaIcons.push('link');
}
if (status.get('poll')) {
media.push(<PollContainer pollId={status.get('poll')} />);
mediaIcons.push('tasks');
}
if (status.get('application')) {
applicationLink = <React.Fragment> · <a className='detailed-status__application' href={status.getIn(['application', 'website'])} target='_blank' rel='noopener noreferrer'>{status.getIn(['application', 'name'])}</a></React.Fragment>;
}