about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorkedama <kedama@foresdon.jp>2018-06-20 22:22:07 +0900
committerEugen Rochko <eugen@zeonfederated.com>2018-06-20 15:22:07 +0200
commit926bfce46565a9b33a627fa8e600c39d0140f8b3 (patch)
tree733ed9c3382230332834b2efa3355ab0a55f8658 /app/javascript
parent80bda9719db387fea9742cef3ff35deee7440afa (diff)
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.
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/features/getting_started/index.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/mastodon/features/getting_started/index.js b/app/javascript/mastodon/features/getting_started/index.js
index 34c7a4298..99642c911 100644
--- a/app/javascript/mastodon/features/getting_started/index.js
+++ b/app/javascript/mastodon/features/getting_started/index.js
@@ -79,7 +79,7 @@ export default class GettingStarted extends ImmutablePureComponent {
 
     const navItems = [];
     let i = 1;
-    let height = 0;
+    let height = (multiColumn) ? 0 : 60;
 
     if (multiColumn) {
       navItems.push(
@@ -109,10 +109,9 @@ export default class GettingStarted extends ImmutablePureComponent {
       navItems.push(
         <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='lock' text={intl.formatMessage(messages.security)} href='/auth/edit' />
       );
 
-      height += 34 + 48*2;
+      height += 34 + 48;
     }
 
     return (