about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/features/ui/components/columns_area.js
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-06-12 17:30:36 +0200
committermultiple creatures <dev@multiple-creature.party>2020-02-22 01:29:52 -0600
commitd7f99383c4574282b8309937519ed6c939e85af2 (patch)
tree8268732e5d8cdd62f1ab9f07dd0754e2ffc721d0 /app/javascript/flavours/glitch/features/ui/components/columns_area.js
parentfe951a00cc4b7bbf1cee454f652bc15d0cd41388 (diff)
Restore navigation bar position glitch-soc setting
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components/columns_area.js')
-rw-r--r--app/javascript/flavours/glitch/features/ui/components/columns_area.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/columns_area.js b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
index 29a200478..bc59abb60 100644
--- a/app/javascript/flavours/glitch/features/ui/components/columns_area.js
+++ b/app/javascript/flavours/glitch/features/ui/components/columns_area.js
@@ -51,6 +51,7 @@ class ColumnsArea extends ImmutablePureComponent {
     swipeToChangeColumns: PropTypes.bool,
     singleColumn: PropTypes.bool,
     children: PropTypes.node,
+    navbarUnder: PropTypes.bool,
   };
 
   state = {
@@ -156,7 +157,7 @@ class ColumnsArea extends ImmutablePureComponent {
   }
 
   render () {
-    const { columns, children, singleColumn, swipeToChangeColumns, intl } = this.props;
+    const { columns, children, singleColumn, swipeToChangeColumns, intl, navbarUnder } = this.props;
     const { shouldAnimate } = this.state;
 
     const columnIndex = getIndex(this.context.router.history.location.pathname);
@@ -182,8 +183,9 @@ class ColumnsArea extends ImmutablePureComponent {
           </div>
 
           <div className='columns-area__panels__main'>
-            <TabsBar key='tabs' />
+            {!navbarUnder && <TabsBar key='tabs' />}
             {content}
+            {navbarUnder && <TabsBar key='tabs' />}
           </div>
 
           <div className='columns-area__panels__pane columns-area__panels__pane--start columns-area__panels__pane--navigational'>