Skip to content

Commit 0ce493a

Browse files
authored
Merge pull request #9032 from wgordon17/master
Update site nav with openshift.com redesign
2 parents 1a64fe5 + 08bd41a commit 0ce493a

8 files changed

+561
-1355
lines changed

Diff for: 404-commercial.html

+135-335
Large diffs are not rendered by default.

Diff for: _stylesheets/docs.css

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
nav#main {
2+
margin-bottom: 15px;
3+
}
4+
15
.navbar.navbar-default.navbar-openshift.navbar-origin {
26
background:
37
linear-gradient(

Diff for: _templates/_footer_other.html.erb

+19-25
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
<footer class="footer-openshift">
1+
<footer id="rh">
22
<div class="container">
33
<div class="row">
4-
<div class="col-xs-12 col-sm-4 col-md-3 logo">
5-
<a href="https://www.redhat.com/"></a>
4+
<div class="col-sm-2">
5+
<img src="https://assets.openshift.net/content/subdomain/redhat_logo.svg" class="img-fluid" alt="Red Hat" style="height: 40px;">
66
</div>
7-
<div class="col-xs-12 col-sm-4 col-md-6 text-center">
8-
<div class="row">
9-
<div class="col-xs-12 col-md-4">
10-
<a href="https://www.openshift.com/legal/privacy.html">
11-
Privacy Policy
12-
</a>
13-
</div>
14-
<div class="col-xs-12 col-md-4">
15-
<a href="https://www.openshift.com/legal/terms.html">
16-
Terms and Conditions
17-
</a>
18-
</div>
19-
<div class="col-xs-12 col-md-4">
20-
<a href="http://www.openshift.org/">
21-
Open Source
22-
</a>
23-
</div>
24-
</div>
7+
8+
<div class="col-sm-3">
9+
<p>Copyright © 2018 <span class="text-nowrap">Red Hat, Inc.</span></p>
10+
</div>
11+
12+
<div class="col-sm-5">
13+
<nav class="nav">
14+
<a href="https://www.redhat.com/en/about/privacy-policy" class="nav-link">Privacy statement</a>
15+
<a href="https://www.openshift.com/legal/terms/" class="nav-link">Terms of use</a>
16+
<a href="https://www.redhat.com/en/about/all-policies-guidelines" class="nav-link">All policies and guidelines</a>
17+
</nav>
2518
</div>
26-
<div class="col-xs-12 col-sm-4 col-md-3 text-right">
27-
<a id="built_with_asciibinder" href="http://asciibinder.org/">
28-
<img src="<%= File.join(images_path, 'asciibinder_web_logo.svg') %>" alt="AsciiBinder" />
19+
20+
<div class="hidden-sm col-sm-2 powered-by">
21+
<a href="https://www.openshift.com/" title="Powered by OpenShift Online">
22+
<img src="https://www.openshift.com/images/logos/powered_by_openshift_reverse.png" alt="Powered by OpenShift Online">
2923
</a>
3024
</div>
3125
</div>
@@ -38,4 +32,4 @@ if (("undefined" !== typeof _satellite) && ("function" === typeof _satellite.pag
3832
_satellite.pageBottom();
3933
}
4034
</script>
41-
<!-- End Adobe DTM -->
35+
<!-- End Adobe DTM -->

Diff for: _templates/_page_openshift.html.erb

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<link href="<%= File.join(css_path, 'search.css') %>" rel="stylesheet" />
1515
<link href="https://assets.openshift.net/content/subdomain/touch-icon-precomposed.png" rel="apple-touch-icon-precomposed" type="image/png">
1616
<link href="https://assets.openshift.net/content/subdomain/favicon32x32.png" rel="shortcut icon" type="text/css">
17+
<link href="https://assets.openshift.net/content/osh-nav-footer.css" rel="stylesheet" type="text/css" media="screen, print" />
1718
<!--[if IE]><link rel="shortcut icon" href="https://assets.openshift.net/content/subdomain/favicon.ico"><![endif]-->
1819
<!-- or, set /favicon.ico for IE10 win -->
1920
<meta content="OpenShift" name="application-name">
@@ -29,6 +30,7 @@
2930
<![endif]-->
3031
<script src="https://assets.openshift.net/content/modernizr.js" type="text/javascript"></script>
3132
<script src="https://assets.openshift.net/content/subdomain.js" type="text/javascript"></script>
33+
<script src="https://assets.openshift.net/content/nav-tertiary.js" type="text/javascript"></script>
3234
<script src="<%= File.join(javascripts_path, "bootstrap-offcanvas.js") %>" type="text/javascript"></script>
3335
<script src="<%= File.join(javascripts_path, "reformat-html.js") %>" type="text/javascript"></script>
3436
<script src="<%= File.join(javascripts_path, "hc-search.js") %>" type="text/javascript"></script>

0 commit comments

Comments
 (0)