hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move “Show action buttons in collapsed toots” option

signup-info-prompt
Thibaut Girka 2018-10-01 19:21:36 +02:00 committed by ThibG
parent faecb35fe0
commit 96c3d26870
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/javascript/flavours/glitch/features/local_settings/page/index.js
View File

@ -186,6 +186,15 @@ export default class LocalSettingsPage extends React.PureComponent {
> >
<FormattedMessage id='settings.enable_collapsed' defaultMessage='Enable collapsed toots' /> <FormattedMessage id='settings.enable_collapsed' defaultMessage='Enable collapsed toots' />
</LocalSettingsPageItem> </LocalSettingsPageItem>
<LocalSettingsPageItem
settings={settings}
item={['collapsed', 'show_action_bar']}
id='mastodon-settings--collapsed-show-action-bar'
onChange={onChange}
dependsOn={[['collapsed', 'enabled']]}
>
<FormattedMessage id='settings.show_action_bar' defaultMessage='Show action buttons in collapsed toots' />
</LocalSettingsPageItem>
<section> <section>
<h2><FormattedMessage id='settings.auto_collapse' defaultMessage='Automatic collapsing' /></h2> <h2><FormattedMessage id='settings.auto_collapse' defaultMessage='Automatic collapsing' /></h2>
<LocalSettingsPageItem <LocalSettingsPageItem
@ -269,18 +278,6 @@ export default class LocalSettingsPage extends React.PureComponent {
<FormattedMessage id='settings.image_backgrounds_media' defaultMessage='Preview collapsed toot media' /> <FormattedMessage id='settings.image_backgrounds_media' defaultMessage='Preview collapsed toot media' />
</LocalSettingsPageItem> </LocalSettingsPageItem>
</section> </section>
<section>
<h2></h2>
<LocalSettingsPageItem
settings={settings}
item={['collapsed', 'show_action_bar']}
id='mastodon-settings--collapsed-show-action-bar'
onChange={onChange}
dependsOn={[['collapsed', 'enabled']]}
>
<FormattedMessage id='settings.show_action_bar' defaultMessage='Show action buttons in collapsed toots' />
</LocalSettingsPageItem>
</section>
</div> </div>
), ),
({ onChange, settings }) => ( ({ onChange, settings }) => (