From c5a33e4cc700b9d6ff311a545759f524d40c1e29 Mon Sep 17 00:00:00 2001
From: Samuel Padgett <spadgett@redhat.com>
Date: Wed, 6 Sep 2017 08:53:37 -0400
Subject: [PATCH] Fix hamburger menu at mobile for pages with no project bar

---
 app/styles/_vertical-nav.less | 4 +++-
 app/views/_sidebar.html       | 3 +--
 dist/scripts/templates.js     | 4 ++--
 dist/styles/main.css          | 5 ++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/styles/_vertical-nav.less b/app/styles/_vertical-nav.less
index 35e7248c79..3002b6708a 100644
--- a/app/styles/_vertical-nav.less
+++ b/app/styles/_vertical-nav.less
@@ -8,11 +8,13 @@
   transition: width .1s ease-in-out, left .1s ease-in-out;
   z-index: 990;
   @media(min-width: @screen-sm-min) {
-    top: @navbar-os-header-height-desktop;
+    // Hide at wider screen widths unless there is a project.
+    display: none;
   }
   .has-project-bar & {
     top: (@navbar-os-header-height-mobile + @project-bar-height-mobile);
     @media(min-width: @screen-sm-min) {
+      display: block;
       top: (@navbar-os-header-height-desktop + @project-bar-height-desktop);
     }
   }
diff --git a/app/views/_sidebar.html b/app/views/_sidebar.html
index b618dc348a..be956dcbef 100644
--- a/app/views/_sidebar.html
+++ b/app/views/_sidebar.html
@@ -1,5 +1,4 @@
 <div
-  ng-if="view.hasProject"
   class="nav-pf-vertical nav-pf-vertical-with-sub-menus"
   ng-class="{
     collapsed: nav.collapsed && !isMobile,
@@ -9,7 +8,7 @@
     'show-mobile-secondary': nav.showMobileNav && sidebar.showMobileSecondary && isMobile
   }"
   on-esc="closeNav()">
-  <nav class="nav-vertical-primary">
+  <nav ng-if="view.hasProject" class="nav-vertical-primary">
     <ul class="list-group">
 
       <!-- Primary Nav -->
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 6bc308b253..eb036e10db 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -458,14 +458,14 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
 
 
   $templateCache.put('views/_sidebar.html',
-    "<div ng-if=\"view.hasProject\" class=\"nav-pf-vertical nav-pf-vertical-with-sub-menus\" ng-class=\"{\n" +
+    "<div class=\"nav-pf-vertical nav-pf-vertical-with-sub-menus\" ng-class=\"{\n" +
     "    collapsed: nav.collapsed && !isMobile,\n" +
     "    'hide-mobile-nav': !nav.showMobileNav && isMobile,\n" +
     "    'hover-secondary-nav-pf': sidebar.secondaryOpen && !isMobile,\n" +
     "    'show-mobile-nav': nav.showMobileNav && isMobile,\n" +
     "    'show-mobile-secondary': nav.showMobileNav && sidebar.showMobileSecondary && isMobile\n" +
     "  }\" on-esc=\"closeNav()\">\n" +
-    "<nav class=\"nav-vertical-primary\">\n" +
+    "<nav ng-if=\"view.hasProject\" class=\"nav-vertical-primary\">\n" +
     "<ul class=\"list-group\">\n" +
     "\n" +
     "<li ng-repeat=\"primaryItem in navItems\" ng-class=\"{\n" +
diff --git a/dist/styles/main.css b/dist/styles/main.css
index 15de5c4c76..008f713fcd 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -5669,10 +5669,9 @@ alerts+.chromeless .log-loading-msg{margin-top:130px}
 .appended-icon{display:inline-block}
 .block{display:block}
 .nav-pf-vertical{background-color:#30363d;top:41px;transition:width .1s ease-in-out,left .1s ease-in-out;z-index:990}
-@media (min-width:768px){.nav-pf-vertical{top:59px}
-}
 .has-project-bar .nav-pf-vertical{top:69px}
-@media (min-width:768px){.has-project-bar .nav-pf-vertical{top:99px}
+@media (min-width:768px){.nav-pf-vertical{display:none}
+.has-project-bar .nav-pf-vertical{display:block;top:99px}
 }
 .nav-pf-vertical .list-group-item{border-color:#050505}
 .nav-pf-vertical .list-group-item:after{background:rgba(255,255,255,.04);content:'';display:block;height:1px;position:absolute;top:0px;width:100%}