]> cat aescling's git repositories - mastodon.git/commitdiff
Add NavigationBar to getting started column in single-column mode
authorThibaut Girka <thib@sitedethib.com>
Wed, 19 Jun 2019 13:16:18 +0000 (15:16 +0200)
committerThibG <thib@sitedethib.com>
Thu, 20 Jun 2019 17:19:46 +0000 (19:19 +0200)
Fixes #1131

app/javascript/flavours/glitch/features/getting_started/index.js

index f669220e3ed77e1661ae8abe5d13508b7862d068..36a445dcaf81020466d9b4e049ff82e04a667673 100644 (file)
@@ -14,6 +14,7 @@ import { List as ImmutableList } from 'immutable';
 import { createSelector } from 'reselect';
 import { fetchLists } from 'flavours/glitch/actions/lists';
 import { preferencesLink, signOutLink } from 'flavours/glitch/util/backend_links';
+import NavigationBar from '../compose/components/navigation_bar';
 import LinkFooter from 'flavours/glitch/features/ui/components/link_footer';
 
 const messages = defineMessages({
@@ -165,7 +166,8 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
       <Column name='getting-started' icon='asterisk' heading={intl.formatMessage(messages.heading)} label={intl.formatMessage(messages.menu)} hideHeadingOnMobile>
         <div className='scrollable optionally-scrollable'>
           <div className='getting-started__wrapper'>
-            <ColumnSubheading text={intl.formatMessage(messages.navigation_subheading)} />
+            {!multiColumn && <NavigationBar account={myAccount} />}
+            {multiColumn && <ColumnSubheading text={intl.formatMessage(messages.navigation_subheading)} />}
             {navItems}
             <ColumnSubheading text={intl.formatMessage(messages.lists_subheading)} />
             {listItems}