Skip to content

Commit 895ce45

Browse files
gabriel-rhjeana-redhat
gabriel-rh
authored and
jeana-redhat
committed
FIX-CSS-JS-418 cherry pick to 4.18
1 parent 471949a commit 895ce45

File tree

3 files changed

+228
-11
lines changed

3 files changed

+228
-11
lines changed

‎_javascripts/page-loader.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
let newLink = "";
2+
let newVersion = "";
3+
let currentVersion = "";
4+
let fileRequested = "";
5+
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+
};
17+
118
function versionSelector(list) {
219

320
// the version we want

‎_stylesheets/docs.css

Lines changed: 201 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,21 @@ div.gsc-option-menu-container > div.gsc-selected-option-container {
3838
margin: 0 10px;
3939
}
4040

41+
/* target safari only hack: https://stackoverflow.com/a/25975282/6758654 */
42+
/* Addresses https://github.com/openshift/openshift-docs/issues/40909 */
43+
@media not all and (min-resolution:.001dpcm) { @supports (-webkit-appearance:none) and (stroke-color:transparent) {
44+
#hc-search.wide {
45+
z-index: 50;
46+
margin-top: 28px;
47+
margin-left: -15px;
48+
}
49+
50+
.sidebar.wide {
51+
padding-top: 30px;
52+
}
53+
}}
54+
/* end safari only */
55+
4156
/* ------------------------------------------------------------
4257
Image: "Spin" https://www.flickr.com/photos/eflon/3655695161/
4358
Author: eflon https://www.flickr.com/photos/eflon/
@@ -293,7 +308,192 @@ h6 > a.anchor:hover {
293308

294309
@media (min-width: 768px) {
295310
.main {
296-
padding-left: 30px;
311+
margin-top: 130px;
312+
border-left: 0px solid #e7e7e7;
313+
margin-left: 315px;
314+
width: 800px;
315+
}
316+
317+
.sidebar {
318+
font-weight: 300;
319+
overflow-wrap: break-word;
320+
position: fixed;
321+
overflow-y: scroll;
322+
z-index: 2;
323+
width: 300px;
324+
background-color: #fff;
325+
margin-left: 5px;
326+
display: flex;
327+
flex-flow: column;
328+
top: 190px;
329+
bottom: 10px;
330+
display: block;
331+
-webkit-animation: fadein 0.35s ease-in; /* Safari, Chrome and Opera > 12.1 */
332+
-moz-animation: fadein 0.35s ease-in; /* Firefox < 16 */
333+
-ms-animation: fadein 0.35s ease-in; /* Internet Explorer */
334+
-o-animation: fadein 0.35s ease-in; /* Opera < 12.1 */
335+
animation: fadein 0.35s ease-in;
336+
}
337+
338+
#hc-search {
339+
position: fixed;
340+
top: 160px;
341+
width: 358px;
342+
}
343+
344+
#hc-search-btn {
345+
border: 1px solid lightgrey;
346+
font-size: 12px;
347+
height: 25px;
348+
width: 31px;
349+
}
350+
351+
.breadcrumb {
352+
margin: 0;
353+
padding: 18px 0 10px;
354+
font-size: 0.92em;
355+
min-height: 65px;
356+
position: fixed;
357+
z-index: 2;
358+
background-color: #fff;
359+
width: 1400px;
360+
margin-top: 60px;
361+
margin-left: 5px;
362+
}
363+
364+
.container {
365+
width: 1440px;
366+
position: relative;
367+
}
368+
369+
nav#main {
370+
height: 90px;
371+
position: fixed;
372+
top: 0;
373+
left: 0;
374+
z-index: 5;
375+
width: 100%;
376+
}
377+
378+
.page-header h1 {
379+
font-size: 30px;
380+
font-weight: 400;
381+
letter-spacing: inherit;
382+
color: inherit;
383+
margin: 10px 0 0 0;
384+
padding: 2px 0 15px 0;
385+
}
386+
387+
#hc-modal-content {
388+
height: 80vh;
389+
margin: auto;
390+
width: 80%;
391+
z-index: 4;
392+
background-color: white;
393+
}
394+
395+
footer#rh {
396+
background-color: #000;
397+
padding: 0px 0;
398+
z-index: 5;
399+
}
400+
401+
.close-btn-sm {
402+
display: none;
403+
}
404+
405+
/*side toc styling here */
406+
407+
#toc:before {
408+
font-family: "RedHatText",Overpass,"Open Sans",Helvetica,Arial,sans-serif;
409+
content: "TABLE OF CONTENTS";
410+
color: #545454;
411+
font-size: 0.82em;
412+
text-decoration: none;
413+
text-align: left;
414+
padding-bottom: 0.6em;
415+
padding-top: 0.6em;
416+
padding-left: 0.8em;
417+
text-rendering: optimizeLegibility;
418+
-webkit-font-smoothing: antialiased;
419+
}
420+
421+
#toc {
422+
user-select: none;
423+
float: right;
424+
padding-top: 0.1em !important;
425+
font-size: 0.8em;
426+
overflow-wrap: break-word;
427+
width: 300px;
428+
position: fixed;
429+
display: flex;
430+
flex-flow: column;
431+
top: 165px;
432+
bottom: 1px;
433+
margin-left: 780px;
434+
height: auto;
435+
max-height: 800px;
436+
overflow-y: auto;
437+
z-index: 2;
438+
vertical-align: top;
439+
border-left: solid;
440+
border-width: 1px;
441+
border-color: #E7E7E7;
442+
-webkit-animation: fadein 0.35s ease-in;
443+
-moz-animation: fadein 0.35s ease-in;
444+
-ms-animation: fadein 0.35s ease-in;
445+
-o-animation: fadein 0.35s ease-in;
446+
animation: fadein 0.35s ease-in;
447+
}
448+
449+
#toc>ul {
450+
margin-left: -2em !important;
451+
list-style: outside none none !important;
452+
height: inherit;
453+
}
454+
455+
#toc ul.sectlevel0>li>a {
456+
list-style: outside none none !important;
457+
}
458+
459+
#toc ul.sectlevel2 {
460+
margin-left: -20px;
461+
}
462+
463+
#toc ul.sectlevel0 ul.sectlevel1 {
464+
margin-top: 0.2em;
465+
list-style: outside none none !important;
466+
}
467+
468+
#toc ul {
469+
font-family: "Open Sans", "DejaVu Sans", "Sans", sans-serif;
470+
list-style-type: none;
471+
margin-bottom: 0.2em !important;
472+
}
473+
474+
#toc li {
475+
margin-bottom: 0.4em !important;
476+
}
477+
478+
#toc a:link {
479+
text-decoration: none;
480+
font-size: inherit;
481+
}
482+
483+
#toc a:hover {
484+
text-decoration: underline;
485+
}
486+
487+
#toc a:active {
488+
font-weight: bold;
489+
}
490+
491+
.toc-active {
492+
font-weight: bold;
493+
}
494+
495+
#toctitle {
496+
color: #7a2518;
297497
}
298498
}
299499

‎_templates/_page_openshift.html.erb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
<%= (distro_key == "openshift-webscale") ? '<meta name="robots" content="noindex,nofollow">' : '' %>
1313
<title><%= [topic_title, subgroup_title].compact.join(' - ') %> | <%= group_title %> | <%= distro %> <%= version %></title>
1414
<link href="https://assets.openshift.net/content/subdomain.css" rel="stylesheet" type="text/css"/>
15-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/search.css" rel="stylesheet" media="screen"/>
16-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/autumn.css" rel="stylesheet" media="screen"/>
15+
<link href="https://docs.okd.io/latest/_stylesheets/search.css" rel="stylesheet" media="screen"/>
16+
<link href="https://docs.okd.io/latest/_stylesheets/autumn.css" rel="stylesheet" media="screen"/>
1717
<link href="https://assets.openshift.net/content/subdomain/touch-icon-precomposed.png" rel="apple-touch-icon-precomposed" type="image/png"/>
1818
<link href="https://assets.openshift.net/content/subdomain/favicon32x32.png" rel="shortcut icon" type="text/css"/>
1919
<link href="https://assets.openshift.net/content/osh-nav-footer.css" rel="stylesheet" type="text/css" media="screen"/>
20-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/docs.css" rel="stylesheet" media="screen"/>
21-
<link href="https://docs.openshift.com/container-platform/4.1/_stylesheets/print.css" rel="stylesheet" type="text/css" media="print"/>
20+
<link href="https://docs.okd.io/latest/_stylesheets/docs.css" rel="stylesheet" media="screen"/>
21+
<link href="https://docs.okd.io/latest/_stylesheets/print.css" rel="stylesheet" type="text/css" media="print"/>
2222
<!--[if IE]><link rel="shortcut icon" href="https://assets.openshift.net/content/subdomain/favicon.ico"><![endif]-->
2323
<!-- or, set /favicon.ico for IE10 win -->
2424
<meta content="OpenShift" name="application-name">
@@ -190,13 +190,13 @@
190190
<script src="https://assets.openshift.net/content/modernizr.js" type="text/javascript"></script>
191191
<script src="https://assets.openshift.net/content/subdomain.js" type="text/javascript"></script>
192192
<script src="https://assets.openshift.net/content/nav-tertiary.js" type="text/javascript"></script>
193-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/bootstrap-offcanvas.js" type="text/javascript"></script>
194-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/reformat-html.js" type="text/javascript"></script>
195-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/hc-search.js" type="text/javascript"></script>
196-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/page-loader.js" type="text/javascript"></script>
193+
<script src="https://docs.okd.io/latest/_javascripts/bootstrap-offcanvas.js" type="text/javascript"></script>
194+
<script src="https://docs.okd.io/latest/_javascripts/reformat-html.js" type="text/javascript"></script>
195+
<script src="https://docs.okd.io/latest/_javascripts/hc-search.js" type="text/javascript"></script>
196+
<script src="https://docs.okd.io/latest/_javascripts/page-loader.js" type="text/javascript"></script>
197197
<script src="https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.6/clipboard.min.js" type="text/javascript"></script>
198-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/clipboard.js" type="text/javascript"></script>
199-
<script src="https://docs.openshift.com/container-platform/4.1/_javascripts/collapsible.js" type="text/javascript"></script>
198+
<script src="https://docs.okd.io/latest/_javascripts/clipboard.js" type="text/javascript"></script>
199+
<script src="https://docs.okd.io/latest/_javascripts/collapsible.js" type="text/javascript"></script>
200200
<script>
201201
var dk = '<%= distro_key %>';
202202
var version = '<%= version %>';

0 commit comments

Comments
 (0)