[GitHub] garrensmith closed pull request #1029: Feat/sidebar design fixes

[GitBox <gi...@apache.org>]

garrensmith closed pull request #1029: Feat/sidebar design fixes
URL: https://github.com/apache/couchdb-fauxton/pull/1029
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/app/addons/documents/assets/less/header-docs-left.less b/app/addons/documents/assets/less/header-docs-left.less
index 2b19048e4..4c73f98e8 100644
--- a/app/addons/documents/assets/less/header-docs-left.less
+++ b/app/addons/documents/assets/less/header-docs-left.less
@@ -58,6 +58,7 @@ button.faux-header__doc-header-dropdown-toggle:focus {
   border: none;
   background-color: transparent;
   border-right: 1px solid #ccc;
+  color: #333;
   width: 40px;
   padding: 11px;
 }
diff --git a/app/addons/fauxton/assets/less/navigation.less b/app/addons/fauxton/assets/less/navigation.less
index 74ba89aea..dd48cabf3 100644
--- a/app/addons/fauxton/assets/less/navigation.less
+++ b/app/addons/fauxton/assets/less/navigation.less
@@ -38,7 +38,7 @@
 
 .faux-navbar__burger {
   background-color: @brandDark2;
-  padding: 19px 0 18px 18px;
+  padding: 19px 0 18px 25px;
 }
 
 .faux-navbar--narrow {
@@ -55,7 +55,7 @@
 
 .faux-navbar__burger__icon {
   color: @navIconColor;
-  font-size: 27px;
+  font-size: 19px;
 }
 
 .faux-navbar__burger__icon--flipped:before{
@@ -201,6 +201,10 @@
   background-size: 40px;
 }
 
+.faux-navbar__spacer {
+  height: 6px;
+}
+
 .faux-navbar__footer {
   display: flex;
   flex-direction: column;
diff --git a/app/addons/fauxton/navigation/components/Burger.js b/app/addons/fauxton/navigation/components/Burger.js
index cbae67b02..56199ced6 100644
--- a/app/addons/fauxton/navigation/components/Burger.js
+++ b/app/addons/fauxton/navigation/components/Burger.js
@@ -25,8 +25,8 @@ const Burger = ({toggleMenu, isMinimized}) => {
   );
 
   const icon = isMinimized ?
-    'icon-resize-horizontal' :
-    'icon-signin faux-navbar__burger__icon--flipped';
+    'icon-chevron-right' :
+    'icon-chevron-left';
 
   return (
     <div className={burgerClasses} onClick={toggleMenu}>
diff --git a/app/addons/fauxton/navigation/components/NavBar.js b/app/addons/fauxton/navigation/components/NavBar.js
index 51cd135b4..70918b6cd 100644
--- a/app/addons/fauxton/navigation/components/NavBar.js
+++ b/app/addons/fauxton/navigation/components/NavBar.js
@@ -76,12 +76,16 @@ class NavBar extends Component {
       <div className={navClasses}>
         <nav>
           <div className="faux-navbar__linkcontainer">
-            <Burger isMinimized={isMinimized} toggleMenu={this.toggleMenu}/>
             <div className="faux-navbar__links">
               {navLinks}
+
+              <div className="faux-navbar__spacer"></div>
+
               {bottomNavLinks}
             </div>
 
+            <Burger isMinimized={isMinimized} toggleMenu={this.toggleMenu}/>
+
             <div className="faux-navbar__footer">
               <Brand isMinimized={isMinimized} />
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services