Merge pull request #1841 from rhamilto/utility-nav-fixes

Merged by openshift-bot

Author: OpenShift Bot

app/styles/_navbar-alt.less

@@ -9,7 +9,7 @@
   // Use initial logo dimensions; or set a width and/or height (eg - background-size: auto 36px)
   // Max logo dimensions width 230px / height 36px
   background-size: initial;
-  height: @navbar-os-header-height-mobile;
+  height: @navbar-os-header-height-mobile - 1; // 1px border-bottom on navbar-os-mobile
   width: 230px;
 }
 
@@ -274,10 +274,8 @@
       color: lighten(@navbar-os-project-menu-color, 20%);
       cursor: pointer;
       display: flex;
-      font-size: 18px;
       &:hover, &:active, &:focus {
-        background-color: @sidebar-os-active-bg;
-        color: @navbar-os-project-menu-color;
+        text-decoration: none;
       }
     }
   }

app/views/directives/header/default-header.html

@@ -1,6 +1,6 @@
 <ng-include ng-if="globalTechPreviewIndicator" src="'views/directives/header/_tech-preview-banner.html'" class="tech-preview-banner"></ng-include>
 <nav class="navbar navbar-pf-alt" role="navigation">
-  <div row>
+  <div row class="nav">
     <div class="navbar-header">
       <!-- mobile nav menu -->
       <div row class="navbar-flex-btn toggle-menu">
@@ -18,7 +18,7 @@
     </div>
     <!-- system status message at mobile -->
 
-    <navbar-utility class="collapse navbar-collapse"></navbar-utility>
+    <navbar-utility class="hidden-xs"></navbar-utility>
 
     <div row
       extension-point

dist/scripts/templates.js

@@ -7113,7 +7113,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
   $templateCache.put('views/directives/header/default-header.html',
     "<ng-include ng-if=\"globalTechPreviewIndicator\" src=\"'views/directives/header/_tech-preview-banner.html'\" class=\"tech-preview-banner\"></ng-include>\n" +
     "<nav class=\"navbar navbar-pf-alt\" role=\"navigation\">\n" +
-    "<div row>\n" +
+    "<div row class=\"nav\">\n" +
     "<div class=\"navbar-header\">\n" +
     "\n" +
     "<div row class=\"navbar-flex-btn toggle-menu\">\n" +
@@ -7130,7 +7130,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
     "</a>\n" +
     "</div>\n" +
     "\n" +
-    "<navbar-utility class=\"collapse navbar-collapse\"></navbar-utility>\n" +
+    "<navbar-utility class=\"hidden-xs\"></navbar-utility>\n" +
     "<div row extension-point extension-name=\"nav-system-status-mobile\" extension-types=\"dom\" class=\"navbar-flex-btn hide-if-empty\"></div>\n" +
     "</div>\n" +
     "</nav>"