treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix broken single column getting-started menu (Fix #7854) (#7862) 

* Fix lack of height of the getting-started menu. (Fix #7854)

Include the height of navigation bar at the height of getting-started menu.

* Remove item "Security" on the getting-started menu.
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
kedama 2018-06-20 22:22:07 +09:00 committed by Eugen Rochko
parent 80bda9719d
commit 926bfce465
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/features/getting_started/index.js
View File

@ -79,7 +79,7 @@ export default class GettingStarted extends ImmutablePureComponent {
const navItems = []; const navItems = [];
let i = 1; let i = 1;
let height = 0; let height = (multiColumn) ? 0 : 60;
if (multiColumn) { if (multiColumn) {
navItems.push( navItems.push(
@ -109,10 +109,9 @@ export default class GettingStarted extends ImmutablePureComponent {
navItems.push( navItems.push(
<ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />, <ColumnSubheading key={i++} text={intl.formatMessage(messages.settings_subheading)} />,
<ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />, <ColumnLink key={i++} icon='gears' text={intl.formatMessage(messages.preferences)} href='/settings/preferences' />,
<ColumnLink key={i++} icon='lock' text={intl.formatMessage(messages.security)} href='/auth/edit' />
); );
height += 34 + 48*2; height += 34 + 48;
} }
return ( return (