Skip to content

Commit 3d4c542

Browse files
committed
Utility nav and Online extension point fixes
1 parent e3e7ba7 commit 3d4c542

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

app/styles/_navbar-alt.less

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// Use initial logo dimensions; or set a width and/or height (eg - background-size: auto 36px)
1010
// Max logo dimensions width 230px / height 36px
1111
background-size: initial;
12-
height: @navbar-os-header-height-mobile;
12+
height: @navbar-os-header-height-mobile - 1; // 1px border-bottom on navbar-os-mobile
1313
width: 230px;
1414
}
1515

@@ -274,10 +274,8 @@
274274
color: lighten(@navbar-os-project-menu-color, 20%);
275275
cursor: pointer;
276276
display: flex;
277-
font-size: 18px;
278277
&:hover, &:active, &:focus {
279-
background-color: @sidebar-os-active-bg;
280-
color: @navbar-os-project-menu-color;
278+
text-decoration: none;
281279
}
282280
}
283281
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ng-include ng-if="globalTechPreviewIndicator" src="'views/directives/header/_tech-preview-banner.html'" class="tech-preview-banner"></ng-include>
22
<nav class="navbar navbar-pf-alt" role="navigation">
3-
<div row>
3+
<div row class="nav">
44
<div class="navbar-header">
55
<!-- mobile nav menu -->
66
<div row class="navbar-flex-btn toggle-menu">
@@ -18,7 +18,7 @@
1818
</div>
1919
<!-- system status message at mobile -->
2020

21-
<navbar-utility class="collapse navbar-collapse"></navbar-utility>
21+
<navbar-utility class="hidden-xs"></navbar-utility>
2222

2323
<div row
2424
extension-point

dist/scripts/templates.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -7036,7 +7036,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
70367036
$templateCache.put('views/directives/header/default-header.html',
70377037
"<ng-include ng-if=\"globalTechPreviewIndicator\" src=\"'views/directives/header/_tech-preview-banner.html'\" class=\"tech-preview-banner\"></ng-include>\n" +
70387038
"<nav class=\"navbar navbar-pf-alt\" role=\"navigation\">\n" +
7039-
"<div row>\n" +
7039+
"<div row class=\"nav\">\n" +
70407040
"<div class=\"navbar-header\">\n" +
70417041
"\n" +
70427042
"<div row class=\"navbar-flex-btn toggle-menu\">\n" +
@@ -7053,7 +7053,7 @@ angular.module('openshiftConsoleTemplates', []).run(['$templateCache', function(
70537053
"</a>\n" +
70547054
"</div>\n" +
70557055
"\n" +
7056-
"<navbar-utility class=\"collapse navbar-collapse\"></navbar-utility>\n" +
7056+
"<navbar-utility class=\"hidden-xs\"></navbar-utility>\n" +
70577057
"<div row extension-point extension-name=\"nav-system-status-mobile\" extension-types=\"dom\" class=\"navbar-flex-btn hide-if-empty\"></div>\n" +
70587058
"</div>\n" +
70597059
"</nav>"

dist/scripts/vendor.js

+4
Original file line numberDiff line numberDiff line change
@@ -36836,6 +36836,10 @@ if (c.color || c.backColor) {
3683636836
var d = "";
3683736837
c.color && (d += "color:" + c.color + ";"), c.backColor && (d += "background-color:" + c.backColor + ";"), b += ".node-" + this._elementId + '[data-nodeId="' + c.nodeId + '"]{' + d + "}";
3683836838
}
36839+
if (c.iconColor) {
36840+
var d = "color:" + c.iconColor + ";";
36841+
b += ".node-" + this._elementId + '[data-nodeId="' + c.nodeId + '"] .node-icon{' + d + "}";
36842+
}
3683936843
}, this)), this._css + b;
3684036844
}, g.prototype._template = {
3684136845
tree:a('<ul class="list-group"></ul>'),

dist/styles/main.css

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)