Fix hamburger menu at mobile for pages with no project bar

openshift · Sep 6, 2017 · c5a33e4 · c5a33e4
1 parent 73c7420
commit c5a33e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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