From e6b1110a927bfcc4435d05147086a689b885dda1 Mon Sep 17 00:00:00 2001 From: Will Gordon Date: Wed, 1 May 2019 17:35:58 -0400 Subject: [PATCH] Update nav and logos Conflicts: 404-commercial.html _templates/_footer_other.html.erb index-commercial.html search-commercial.html --- 404-commercial.html | 167 +++++++++++++-------------- _templates/_footer_origin.html.erb | 4 +- _templates/_footer_other.html.erb | 38 +++--- _templates/_topnav_other.html | 127 ++++++++++---------- index-commercial.html | 174 ++++++++++++++-------------- index-community.html | 6 +- search-commercial.html | 179 +++++++++++++---------------- 7 files changed, 332 insertions(+), 363 deletions(-) diff --git a/404-commercial.html b/404-commercial.html index ddc89fd3f2..94a3401166 100644 --- a/404-commercial.html +++ b/404-commercial.html @@ -11,10 +11,10 @@ 404 | Red Hat OpenShift Documentation + - @@ -50,82 +50,82 @@ height="0" width="0" style="display:none;visibility:hidden">
+
-
  • -
  • @@ -150,10 +150,9 @@ height="0" width="0" style="display:none;visibility:hidden">
    • -
    • - -
    • +
    • +
    • @@ -180,31 +179,25 @@ height="0" width="0" style="display:none;visibility:hidden"> diff --git a/_templates/_footer_origin.html.erb b/_templates/_footer_origin.html.erb index 64709cb0bb..8e006d7464 100644 --- a/_templates/_footer_origin.html.erb +++ b/_templates/_footer_origin.html.erb @@ -29,12 +29,12 @@
    - Powered by OpenShift Online + Powered by OpenShift Online
    diff --git a/_templates/_footer_other.html.erb b/_templates/_footer_other.html.erb index c2ed6c29a1..4bbe9c774c 100644 --- a/_templates/_footer_other.html.erb +++ b/_templates/_footer_other.html.erb @@ -1,29 +1,23 @@ diff --git a/_templates/_topnav_other.html b/_templates/_topnav_other.html index 536778ac54..45552f2ba8 100644 --- a/_templates/_topnav_other.html +++ b/_templates/_topnav_other.html @@ -8,82 +8,82 @@ height="0" width="0" style="display:none;visibility:hidden">
    +
    -
  • -
  • @@ -108,10 +108,9 @@ height="0" width="0" style="display:none;visibility:hidden">
    • -
    • - -
    • +
    • +
    • diff --git a/index-commercial.html b/index-commercial.html index 9f7aa937ed..73a09f2e07 100644 --- a/index-commercial.html +++ b/index-commercial.html @@ -11,10 +11,10 @@ Home | Red Hat OpenShift Documentation + - @@ -50,82 +50,82 @@ height="0" width="0" style="display:none;visibility:hidden">
    +
    -
  • -
  • @@ -150,10 +150,9 @@ height="0" width="0" style="display:none;visibility:hidden">
    • -
    • - -
    • +
    • +
    • @@ -219,6 +218,13 @@ height="0" width="0" style="display:none;visibility:hidden"> +
    +

    OpenShift Container Engine

    +
    +

    The OpenShift Container Engine is the core of the OpenShift Container Platform. Use OpenShift Container Platform docs links for OpenShift Container Engine documentation.

    + Read more about OCE. +
    +

    OpenShift Dedicated

    @@ -240,31 +246,25 @@ height="0" width="0" style="display:none;visibility:hidden">
    diff --git a/index-community.html b/index-community.html index 3595a295b0..a8a1ed5e23 100644 --- a/index-community.html +++ b/index-community.html @@ -53,7 +53,7 @@

    Documentation

    -

    OKD is a distribution of Kubernetes optimized for continuous application development and multi-tenant deployment. OKD also serves as the upstream code base upon which Red Hat OpenShift Online and Red Hat OpenShift Container Platform are built.

    +

    OKD is a distribution of Kubernetes optimized for continuous application development and multi-tenant deployment. OKD also serves as the upstream code base upon which Red Hat OpenShift Online and Red Hat OpenShift Container Platform are built.