From de5136f9cb10f440008fdf336ef10c66a46d6323 Mon Sep 17 00:00:00 2001
From: Toni Dezman <tdezman@biosistemika.com>
Date: Thu, 24 Aug 2017 09:22:37 +0200
Subject: [PATCH] fixes navigation container

---
 app/javascript/packs/src/settings/app.jsx     |  2 +-
 .../packs/src/settings/components/MainNav.jsx | 24 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/javascript/packs/src/settings/app.jsx b/app/javascript/packs/src/settings/app.jsx
index 3cd2ea9cb..3269663ed 100644
--- a/app/javascript/packs/src/settings/app.jsx
+++ b/app/javascript/packs/src/settings/app.jsx
@@ -15,7 +15,7 @@ addLocaleData([...enLocaleData]);
 const locale = "en-US";
 
 const SettingsPage = () =>
-  <div className="container">
+  <div>
     <MainNav />
   </div>;
 
diff --git a/app/javascript/packs/src/settings/components/MainNav.jsx b/app/javascript/packs/src/settings/components/MainNav.jsx
index 653844b0e..a875b129d 100644
--- a/app/javascript/packs/src/settings/components/MainNav.jsx
+++ b/app/javascript/packs/src/settings/components/MainNav.jsx
@@ -30,7 +30,7 @@ export default class MainNav extends Component {
     return (
       <div>
         <Navigation page="Settings" />
-        <div>
+        <div className="container">
           <Nav bsStyle="tabs" activeKey="1" onSelect={this.handleSelect}>
             <LinkContainer
               active={this.state.active === "1"}
@@ -49,18 +49,18 @@ export default class MainNav extends Component {
               </NavItem>
             </LinkContainer>
           </Nav>
+          <Switch>
+            <Route exact path="/" component={SettingsAccount} />
+            <Route
+              exact
+              path="/settings"
+              render={() => <Redirect to="/settings/account/profile" />}
+            />
+            <Route path="/settings/account" component={SettingsAccount} />
+            <Route path="/settings/teams" component={SettingsTeams} />
+            <Route component={NotFound} />
+          </Switch>
         </div>
-        <Switch>
-          <Route exact path="/" component={SettingsAccount} />
-          <Route
-            exact
-            path="/settings"
-            render={() => <Redirect to="/settings/account/profile" />}
-          />
-          <Route path="/settings/account" component={SettingsAccount} />
-          <Route path="/settings/teams" component={SettingsTeams} />
-          <Route component={NotFound} />
-        </Switch>
       </div>
     );
   }