openshift · openshift-merge-robot · Jul 25, 2018 · Sep 5, 2017
diff --git a/app/images/logo-OCP-console-hdr-stacked.svg b/app/images/logo-OCP-console-hdr-stacked.svg
diff --git a/app/images/logo-OCP-console-hdr-thin.svg b/app/images/logo-OCP-console-hdr-thin.svg
diff --git a/app/scripts/constants.js b/app/scripts/constants.js
@@ -12,7 +12,7 @@ if (angular.isUndefined(window.OPENSHIFT_CONSTANTS)) {
 
 angular.extend(window.OPENSHIFT_CONSTANTS, {
   // Maps links to specific topics in external documentation.
-  HELP_BASE_URL: "https://docs.openshift.org/latest/",
+  HELP_BASE_URL: "https://docs.openshift.com/container-platform/3.11/",
   HELP: {
     "cli":                     "cli_reference/index.html",
     "get_started_cli":         "cli_reference/get_started_cli.html",
@@ -64,7 +64,33 @@ angular.extend(window.OPENSHIFT_CONSTANTS, {
 
   // Maps links names to URL's where the CLI tools can be downloaded, may point directly to files or to external pages in a CDN, for example.
   CLI: {
-    "Latest Release":          "https://github.com/openshift/origin/releases/latest"
+    "Latest Release":          "https://access.redhat.com/downloads/content/290"
+  },
+
+  // Change the minishift link to the CDK for enterprise.
+  CATALOG_HELP_RESOURCES: {
+    links: [
+      {
+        title: 'Documentation',
+        help: ''
+      },
+      {
+        title: 'Interactive Learning Portal',
+        href: 'https://learn.openshift.com'
+      },
+      {
+        title: 'Container Development Kit',
+        href: 'https://developers.redhat.com/products/cdk/overview/'
+      },
+      {
+        title: 'YouTube',
+        href: 'https://www.youtube.com/user/rhopenshift'
+      },
+      {
+        title: 'Blog',
+        href: 'https://blog.openshift.com'
+      }
+    ]
   },
 
   // Optional default CPU target percentage for horizontal pod autoscalers

diff --git a/app/styles/_navbar-vertical.less b/app/styles/_navbar-vertical.less
@@ -3,15 +3,17 @@
 //  -----------------------------------------------
 
 #header-logo {
-  background-image: url('@{image-path}/logo-origin-thin.svg');
+  background-image: url('@{image-path}/logo-OCP-console-hdr-stacked.svg');
   background-position: left center;
   background-repeat: no-repeat;
-  // Max logo dimensions width 196px / height 40px
+  // Max logo dimensions width 128px / height 40px
   height: @navbar-os-header-height-mobile - 1; // 1px border-bottom on navbar-os-mobile
-  width: 191px;
-  // @media(min-width: @screen-sm-min) {
-    // Max logo dimensions width 230px / height 40px
-  // }
+  width: 128px;
+  @media (min-width: 475px) {
+    background-image: url('@{image-path}/logo-OCP-console-hdr-thin.svg');
+    // Max logo dimensions width 320px / height 40px
+    width: 320px;
+  }
 }
 
 .navbar-pf-vertical {

diff --git a/dist.java/java/index.html b/dist.java/java/index.html
@@ -2,7 +2,7 @@
 <html>
 
   <head>
-    <title>openshift-jvm</title>
+    <title>OpenShift Container Platform JVM Console</title>
     <base href="/">
     <meta charset="UTF8">
 
@@ -13,8 +13,8 @@
   <body ng-controller="OpenshiftJvm.MainController">
     <nav class="navbar navbar-default navbar-fixed-top navbar-pf" role="navigation" ng-cloak>
       <div class="navbar-header">
-        <span class="navbar-brand">
-          <img src="img/logo-origin-thin.svg">
+        <span class="navbar-brand" style="padding-top: 6px; padding-bottom: 5px;">
+          <img src="../images/logo-OCP-console-hdr-thin.svg" style="height: 13px;">
         </span>
       </div>
       <ul class="nav navbar-nav navbar-utility">

diff --git a/dist/images/logo-OCP-console-hdr-stacked.svg b/dist/images/logo-OCP-console-hdr-stacked.svg