[couchdb-fauxton] branch master updated: (#898) - moving the Burger inside the flex container

[ga...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

garren pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git

The following commit(s) were added to refs/heads/master by this push:
       new  6c9c80f    (#898) - moving the Burger inside the flex container
6c9c80f is described below

commit 6c9c80f7637cc43470a070cca68fb901532182d8
Author: Ryan Millay <rm...@us.ibm.com>
AuthorDate: Mon Apr 17 09:52:26 2017 -0400

     (#898) - moving the Burger inside the flex container
---
 app/addons/fauxton/assets/less/navigation.less     | 4 ----
 app/addons/fauxton/navigation/components/NavBar.js | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/addons/fauxton/assets/less/navigation.less b/app/addons/fauxton/assets/less/navigation.less
index 00f6dad..2d89e34 100644
--- a/app/addons/fauxton/assets/less/navigation.less
+++ b/app/addons/fauxton/assets/less/navigation.less
@@ -1,5 +1,4 @@
 .faux-navbar {
-  margin-top: 64px;
   background-color: @brandDark2;
   position: absolute;
   left: 0;
@@ -40,9 +39,6 @@
 .faux-navbar__burger {
   background-color: @brandDark2;
   padding: 19px 0 18px 18px;
-  position: fixed;
-  z-index: 100;
-  top: 0;
 }
 
 .faux-navbar--narrow {
diff --git a/app/addons/fauxton/navigation/components/NavBar.js b/app/addons/fauxton/navigation/components/NavBar.js
index 3a83a11..cbd9ff5 100644
--- a/app/addons/fauxton/navigation/components/NavBar.js
+++ b/app/addons/fauxton/navigation/components/NavBar.js
@@ -73,8 +73,8 @@ class NavBar extends Component {
     return (
       <div className={navClasses}>
         <nav>
-          <Burger isMinimized={isMinimized} toggleMenu={this.toggleMenu}/>
           <div className="faux-navbar__linkcontainer">
+            <Burger isMinimized={isMinimized} toggleMenu={this.toggleMenu}/>
             <div className="faux-navbar__links">
               {navLinks}
               {bottomNavLinks}

-- 
To stop receiving notification emails like this one, please contact
['"commits@couchdb.apache.org" <co...@couchdb.apache.org>'].