From 3d4c542ad0556630a8ce148597e4a086669575bd Mon Sep 17 00:00:00 2001
From: Robb Hamilton <rhamilto@redhat.com>
Date: Thu, 13 Jul 2017 09:16:16 -0400
Subject: [PATCH] Utility nav and Online extension point fixes

---
 app/styles/_navbar-alt.less                     | 6 ++----
 app/views/directives/header/default-header.html | 4 ++--
 dist/scripts/templates.js                       | 4 ++--
 dist/scripts/vendor.js                          | 4 ++++
 dist/styles/main.css                            | 6 +++---
 5 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/styles/_navbar-alt.less b/app/styles/_navbar-alt.less
index bf86ae8004..cd64a46093 100644
--- a/app/styles/_navbar-alt.less
+++ b/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;
       }
     }
   }
diff --git a/app/views/directives/header/default-header.html b/app/views/directives/header/default-header.html
index e85eb6fd23..127dd79add 100644
--- a/app/views/directives/header/default-header.html
+++ b/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
diff --git a/dist/scripts/templates.js b/dist/scripts/templates.js
index 481d92e67e..ae5f18166f 100644
--- a/dist/scripts/templates.js
+++ b/dist/scripts/templates.js
@@ -7036,7 +7036,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" +
@@ -7053,7 +7053,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>"
diff --git a/dist/scripts/vendor.js b/dist/scripts/vendor.js
index cd80b7c93e..fc5bc0a656 100644
--- a/dist/scripts/vendor.js
+++ b/dist/scripts/vendor.js
@@ -36836,6 +36836,10 @@ if (c.color || c.backColor) {
 var d = "";
 c.color && (d += "color:" + c.color + ";"), c.backColor && (d += "background-color:" + c.backColor + ";"), b += ".node-" + this._elementId + '[data-nodeId="' + c.nodeId + '"]{' + d + "}";
 }
+if (c.iconColor) {
+var d = "color:" + c.iconColor + ";";
+b += ".node-" + this._elementId + '[data-nodeId="' + c.nodeId + '"] .node-icon{' + d + "}";
+}
 }, this)), this._css + b;
 }, g.prototype._template = {
 tree:a('<ul class="list-group"></ul>'),
diff --git a/dist/styles/main.css b/dist/styles/main.css
index 333aeb0a65..43faa5d2c6 100644
--- a/dist/styles/main.css
+++ b/dist/styles/main.css
@@ -4787,7 +4787,7 @@ h2+.list-view-pf{margin-top:20px}
 .list-view-pf-additional-info{width:40%}
 .list-view-pf-description{width:60%}
 }
-#header-logo{background-image:url(../images/logo-origin-thin.svg);background-repeat:no-repeat;background-position:center left;background-size:initial;height:46px;width:230px}
+#header-logo{background-image:url(../images/logo-origin-thin.svg);background-repeat:no-repeat;background-position:center left;background-size:initial;height:45px;width:230px}
 .navbar-pf-alt{background:#1c2127;border-bottom:1px solid #050505;border-left:1px solid transparent;border-right:1px solid transparent;border-top:0;min-height:inherit}
 .layout-pf-alt-fixed .navbar-pf-alt{left:0;position:fixed;right:0;top:0;z-index:1030}
 .layout-pf-alt-fixed .tech-preview .navbar-pf-alt{top:20px}
@@ -4846,8 +4846,8 @@ h2+.list-view-pf{margin-top:20px}
 .layout-pf-alt-fixed .navbar-pf-alt .navbar-brand:after{content:'';background:#050505;display:block;height:100%;left:-1px;position:absolute;top:0;width:1px}
 .top-header.logged-out .toggle-menu{display:none}
 .navbar-flex-btn{flex:0 0 50px}
-.navbar-flex-btn>a{color:#fff;cursor:pointer;display:flex;font-size:18px}
-.navbar-flex-btn>a:active,.navbar-flex-btn>a:focus,.navbar-flex-btn>a:hover{background-color:#383f47;color:#dbdada}
+.navbar-flex-btn>a{color:#fff;cursor:pointer;display:flex}
+.navbar-flex-btn>a:active,.navbar-flex-btn>a:focus,.navbar-flex-btn>a:hover{text-decoration:none}
 .navbar-pf-alt .nav-item-iconic{align-items:center;flex:1 1 auto;justify-content:center;padding:0!important}
 .navbar-pf-alt .nav-item-iconic.system-status:before{background:rgba(255,255,255,.1);content:'';display:block;height:100%;left:0px;position:absolute;top:0;width:1px}
 .navbar-pf-alt .nav-item-iconic.system-status:hover{background:0 0;text-decoration:none}