diff options
| author | Chris <chris@cwmart.in> | 2017-12-23 22:47:02 -0500 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-12-24 04:47:02 +0100 |
| commit | 081956742cbcd6a51e48669fc5e3d21df0f879a7 (patch) | |
| tree | bd6780bebac9b4253c51357c2ea23add4b79a8cf /app/javascript/mastodon/features/getting_started/index.js | |
| parent | 8528fd89d21673a94f12b599936d1238f6b80ce5 (diff) | |
removed references to hideOnMobile in column_link and getting_started (#6082)
* removed references to hideOnMobile in column_link and getting_started * move keyboard shortcuts back below blocked users
Diffstat (limited to 'app/javascript/mastodon/features/getting_started/index.js')
| -rw-r--r-- | app/javascript/mastodon/features/getting_started/index.js | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js index 4b4c02bcc..11fb6d365 100644 --- a/app/javascript/mastodon/features/getting_started/index.js +++ b/app/javascript/mastodon/features/getting_started/index.js @@ -71,19 +71,22 @@ export default class GettingStarted extends ImmutablePureComponent { navItems = navItems.concat([ <ColumnLink key='4' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />, <ColumnLink key='5' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />, - <ColumnLink key='9' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />, + <ColumnLink key='6' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />, ]); if (myAccount.get('locked')) { - navItems.push(<ColumnLink key='6' icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />); + navItems.push(<ColumnLink key='7' icon='users' text={intl.formatMessage(messages.follow_requests)} to='/follow_requests' />); } navItems = navItems.concat([ - <ColumnLink key='7' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />, - <ColumnLink key='8' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />, - <ColumnLink key='10' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' hideOnMobile />, + <ColumnLink key='8' icon='volume-off' text={intl.formatMessage(messages.mutes)} to='/mutes' />, + <ColumnLink key='9' icon='ban' text={intl.formatMessage(messages.blocks)} to='/blocks' />, ]); + if (multiColumn) { + navItems.push(<ColumnLink key='10' icon='question' text={intl.formatMessage(messages.keyboard_shortcuts)} to='/keyboard-shortcuts' />); + } + return ( <Column icon='asterisk' heading={intl.formatMessage(messages.heading)} hideHeadingOnMobile> <div className='getting-started__wrapper'> |