From 2668d56334353e20f81b9ce14da5d2c9d0b3bdd9 Mon Sep 17 00:00:00 2001 From: cwm Date: Fri, 8 Dec 2017 20:30:45 -0600 Subject: [PATCH] add keyboard shortcut to getting started, add missing list style --- .../glitch/features/getting_started/index.js | 3 ++- .../flavours/glitch/styles/components/index.scss | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js index 469fc2aa71..5307e583fe 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([ , , - , + , ]); 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 147690562b..db51b164d6 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;