diff options
author | cwm <chriswmartin@protonmail.com> | 2017-12-08 20:30:45 -0600 |
---|---|---|
committer | cwm <chriswmartin@protonmail.com> | 2017-12-08 20:30:45 -0600 |
commit | b165950ca76f45bc04a730d61853063c0100914c (patch) | |
tree | a37870a753f29c248dd2090042f1d46b2df2ac4c /app | |
parent | 47157e07b25f80aa9d2f90591bb59cf32cf593be (diff) |
add keyboard shortcut to getting started, add missing list style
Diffstat (limited to 'app')
-rw-r--r-- | app/javascript/flavours/glitch/features/getting_started/index.js | 3 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/styles/components/index.scss | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js index 469fc2aa7..5307e583f 100644 --- a/app/javascript/flavours/glitch/features/getting_started/index.js +++ b/app/javascript/flavours/glitch/features/getting_started/index.js @@ -30,6 +30,7 @@ const messages = defineMessages({ show_me_around: { id: 'getting_started.onboarding', defaultMessage: 'Show me around' }, pins: { id: 'navigation_bar.pins', defaultMessage: 'Pinned toots' }, lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' }, + keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' }, }); const mapStateToProps = state => ({ @@ -88,7 +89,7 @@ export default class GettingStarted extends ImmutablePureComponent { navItems = navItems.concat([ <ColumnLink key='5' icon='star' text={intl.formatMessage(messages.favourites)} to='/favourites' />, <ColumnLink key='6' icon='thumb-tack' text={intl.formatMessage(messages.pins)} to='/pinned' />, - <ColumnLink key='9' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />, + <ColumnLink key='11' icon='bars' text={intl.formatMessage(messages.lists)} to='/lists' />, ]); if (myAccount.get('locked')) { diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index 147690562..db51b164d 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -2542,6 +2542,10 @@ button.icon-button.active i.fa-retweet { margin-left: 0; } +.column-header__links .text-btn { + margin-right: 10px; +} + .column-header__button { background: lighten($ui-base-color, 4%); border: 0; @@ -2664,6 +2668,14 @@ button.icon-button.active i.fa-retweet { overflow-y: hidden; } + hr { + height: 0; + background: transparent; + border: 0; + border-top: 1px solid lighten($ui-base-color, 12%); + margin: 10px 0; + } + // notif cleaning drawer &.ncd { transition: none; |