Skip to content

Commit daf143a

Browse files
authored
FIX-CSS-JS-PIPELINES
FIX-CSS-JS-PIPELINES add js/css fix
2 parents a4f3487 + a5d7434 commit daf143a

File tree

3 files changed

+37
-17
lines changed

3 files changed

+37
-17
lines changed

_javascripts/page-loader.js

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@ newLink = "";
33
newVersion = "";
44
currentVersion = "";
55

6-
// the fileRequested
7-
fileRequested = "";
8-
9-
//Array prototype to check if an element is in an array
10-
Array.prototype.contains = function(obj) {
11-
return this.indexOf(obj) > -1;
12-
}
6+
const urlMappings = {
7+
"openshift-acs": "https://docs.openshift.com/acs/",
8+
"openshift-builds": "https://docs.openshift.com/builds/",
9+
"openshift-enterprise": "https://docs.openshift.com/container-platform/",
10+
"openshift-gitops": "https://docs.openshift.com/gitops/",
11+
"openshift-lightspeed": "https://docs.openshift.com/lightspeed/",
12+
"openshift-origin": "https://docs.okd.io/",
13+
"openshift-pipelines": "https://docs.openshift.com/pipelines/",
14+
"openshift-serverless": "https://docs.openshift.com/serverless/",
15+
"openshift-telco": "https://docs.openshift.com/container-platform-telco/",
16+
};
1317

1418
function versionSelector(list) {
1519

_stylesheets/docs.css

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,21 @@ div.gsc-option-menu-container>div.gsc-selected-option-container {
5353
margin: 0 10px;
5454
}
5555

56+
/* target safari only hack: https://stackoverflow.com/a/25975282/6758654 */
57+
/* Addresses https://github.com/openshift/openshift-docs/issues/40909 */
58+
@media not all and (min-resolution:.001dpcm) { @supports (-webkit-appearance:none) and (stroke-color:transparent) {
59+
#hc-search.wide {
60+
z-index: 50;
61+
margin-top: 28px;
62+
margin-left: -15px;
63+
}
64+
65+
.sidebar.wide {
66+
padding-top: 30px;
67+
}
68+
}}
69+
/* end safari only */
70+
5671
/* ------------------------------------------------------------
5772
Image: "Spin" https://www.flickr.com/photos/eflon/3655695161/
5873
Author: eflon https://www.flickr.com/photos/eflon/
@@ -532,6 +547,7 @@ h2:hover>a.anchor, h2>a.anchor:hover, h3:hover>a.anchor, h3>a.anchor:hover, h4:h
532547
}
533548

534549
#toc {
550+
user-select: none;
535551
float: right;
536552
padding-top: 0.1em !important;
537553
font-size: 0.8em;

_templates/_page_openshift.html.erb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
<%= ((["3.0", "3.1", "3.2", "3.3", "3.4", "3.5", "3.6", "3.7", "3.9", "3.10", "4.1", "4.2", "4.3", "4.4", "4.5", "4.6", "4.7"].include?(version)) && distro_key == "openshift-enterprise") ? '<meta name="googlebot" content="noindex">' : '' %>
1515
<title><%= [topic_title, subgroup_title].compact.join(' - ') %> | <%= group_title %> | <%= distro %> <%= version %></title>
1616
<link href="https://assets.openshift.net/content/subdomain.css" rel="stylesheet" type="text/css"/>
17-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/search.css" rel="stylesheet" media="screen"/>
18-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/autumn.css" rel="stylesheet" media="screen"/>
17+
<link href="https://docs.okd.io/latest/_stylesheets/search.css" rel="stylesheet" media="screen"/>
18+
<link href="https://docs.okd.io/latest/_stylesheets/autumn.css" rel="stylesheet" media="screen"/>
1919
<link href="https://assets.openshift.net/content/subdomain/touch-icon-precomposed.png" rel="apple-touch-icon-precomposed" type="image/png"/>
2020
<link href="https://assets.openshift.net/content/subdomain/favicon32x32.png" rel="shortcut icon" type="text/css"/>
2121
<link href="https://assets.openshift.net/content/osh-nav-footer.css" rel="stylesheet" type="text/css" media="screen"/>
22-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/docs.css" rel="stylesheet" media="screen"/>
23-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/print.css" rel="stylesheet" type="text/css" media="print"/>
22+
<link href="https://docs.okd.io/latest/_stylesheets/docs.css" rel="stylesheet" media="screen"/>
23+
<link href="https://docs.okd.io/latest/_stylesheets/print.css" rel="stylesheet" type="text/css" media="print"/>
2424
<!--[if IE]><link rel="shortcut icon" href="https://assets.openshift.net/content/subdomain/favicon.ico"><![endif]-->
2525
<!-- or, set /favicon.ico for IE10 win -->
2626
<meta content="OpenShift" name="application-name">
@@ -330,13 +330,13 @@
330330
<script src="https://assets.openshift.net/content/modernizr.js" type="text/javascript"></script>
331331
<script src="https://assets.openshift.net/content/subdomain.js" type="text/javascript"></script>
332332
<script src="https://assets.openshift.net/content/nav-tertiary.js" type="text/javascript"></script>
333-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/bootstrap-offcanvas.js" type="text/javascript"></script>
334-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/reformat-html.js" type="text/javascript"></script>
335-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/hc-search.js" type="text/javascript"></script>
336-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/page-loader.js" type="text/javascript"></script>
333+
<script src="https://docs.okd.io/latest/_javascripts/bootstrap-offcanvas.js" type="text/javascript"></script>
334+
<script src="https://docs.okd.io/latest/_javascripts/reformat-html.js" type="text/javascript"></script>
335+
<script src="https://docs.okd.io/latest/_javascripts/hc-search.js" type="text/javascript"></script>
336+
<script src="https://docs.okd.io/latest/_javascripts/page-loader.js" type="text/javascript"></script>
337337
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" type="text/javascript"></script>
338-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/clipboard.js" type="text/javascript"></script>
339-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/collapsible.js" type="text/javascript"></script>
338+
<script src="https://docs.okd.io/latest/_javascripts/clipboard.js" type="text/javascript"></script>
339+
<script src="https://docs.okd.io/latest/_javascripts/collapsible.js" type="text/javascript"></script>
340340
<script>
341341
var dk = '<%= distro_key %>';
342342
var version = '<%= version %>';

0 commit comments

Comments
 (0)