Compare commits

...

10 Commits

Author SHA1 Message Date
Zach Corleissen 080b22169e Update release-1.5 for version changes in 1.9 (#6522)
* Update release-1.5 for version changes in 1.9

🛑 DO NOT MERGE 🛑

Update config files to use 1.9 as version number.

* Update _config.yml
2017-12-15 17:41:03 -06:00
Steve Perry 22910104c1 Update URL for 1.7 docs. 2017-10-10 12:41:17 -07:00
Steve Perry ec7c69a674 Add 1.8 to version picker for 1.5 docs. (#5832) 2017-10-09 21:55:30 -07:00
Andrew Chen ee680d35bd Merge pull request #5271 from kubernetes/chenopis-1.5-patch
Make caret for version drop-down more visible for v1.5
2017-09-01 17:08:10 -07:00
Andrew Chen 88e98761c9 Make caret for version drop-down more visible for v1.5 2017-09-01 17:04:59 -07:00
Andrew Chen e6dce6fea2 Add deprecation warning to release-1.5 (#4758)
* Add Version Selector

* merge in newer sass

* Add deprecation warning to release-1.5

* update user guide migration notice
2017-08-10 22:41:51 -07:00
Andrew Chen 6081284b38 Add Version Selector to v1.5 (#4745)
* Add Version Selector

* merge in newer sass
2017-08-10 16:38:59 -07:00
Andrew Chen c588b79b71 update githubbranch 2017-08-07 16:34:20 -07:00
Andrew Chen 7d05a7a520 switch to page variable from hardcoded master 2017-08-07 16:24:59 -07:00
Andrew Chen 0f8447c32b update version number 2017-08-07 16:20:09 -07:00
10 changed files with 398 additions and 26 deletions
+32 -3
View File
@@ -17,9 +17,38 @@ defaults:
scope:
path: ""
values:
version: "v1.5.1"
githubbranch: "master"
docsbranch: "master"
version: "v1.5"
githubbranch: "v1.5.7"
docsbranch: "release-1.5"
versions:
- fullversion: "v1.9.0"
version: "v1.9"
githubbranch: "v1.9.0"
docsbranch: "release-1.9"
url: https://kubernetes.io/docs/home/
- fullversion: "v1.8.4"
version: "v1.8"
githubbranch: "v1.8.4"
docsbranch: "release-1.8"
url: https://v1-8.docs.kubernetes.io/docs/home/
- fullversion: "v1.7.3"
version: "v1.7"
githubbranch: "v1.7.3"
docsbranch: "release-1.7"
url: https://v1-7.docs.kubernetes.io/docs/home/
- fullversion: "v1.6.8"
version: "v1.6"
githubbranch: "v1.6.8"
docsbranch: "release-1.6"
url: https://v1-6.docs.kubernetes.io/docs/home/
- fullversion: "v1.5.7"
version: "v1.5"
githubbranch: "v1.5.7"
docsbranch: "release-1.5"
url: https://v1-5.docs.kubernetes.io/docs/
deprecated: true
currentUrl: https://kubernetes.io/docs/home/
nextUrl: http://kubernetes-io-vnext-staging.netlify.com/
-
scope:
path: "docs"
+12
View File
@@ -0,0 +1,12 @@
{% if page.deprecated %}
<section id="deprecationWarning">
<main>
<div class="content deprecation-warning">
<h3>
Documentation for Kubernetes {{ page.version}} is no longer actively maintained. The version you are currently viewing is a static snapshot.
For up-to-date documentation, see the <a href="{{ page.currentUrl }}">latest</a> version.
</h3>
</div>
</main>
</section>
{% endif %}
+1
View File
@@ -7,6 +7,7 @@
<link rel="stylesheet" href="/css/styles.css"/>
<link rel="stylesheet" href="/css/jquery-ui.min.css">
<link rel="stylesheet" href="/css/sweetalert.css">
{% if page.deprecated %}<link rel="stylesheet" type="text/css" href="/css/deprecation-warning.css">{% endif %}
{% if page.class == "gridPage" %}<link rel="stylesheet" href="/css/gridpage.css">{% endif %}
<script src="/js/jquery-2.2.0.min.js"></script>
<script src="/js/jquery-ui.min.js"></script>
+11
View File
@@ -10,6 +10,17 @@
<li><a href="/partners/">Partners</a></li>
<li><a href="/community/">Community</a></li>
<li><a href="/case-studies/">Case Studies</a></li>
<li>
<a href="#">
{{page.version}} <span class="ui-icon ui-icon-carat-1-s"></span>
</a>
<ul>
{% for version in page.versions %}
<li><a href="{{ version.url }}">{{ version.version }}</a></li>
{% endfor %}
</ul>
</li>
</li>
</ul>
<!-- <a href="/docs/" class="button" id="viewDocs" data-auto-burger-exclude>View Documentation</a> -->
<a href="/docs/tutorials/kubernetes-basics/" class="button" id="tryKubernetes" data-auto-burger-exclude>Try Kubernetes</a>
+2 -2
View File
@@ -4,8 +4,8 @@
<tr>
<td>
<p><b>NOTICE</b></p>
<p>As of March 14, 2017, the Kubernetes SIG-Docs-Maintainers group have begun migration of the User Guide content as announced previously to the <a href="https://github.com/kubernetes/community/tree/master/sig-docs">SIG Docs community</a> through the <a href="https://groups.google.com/forum/#!forum/kubernetes-sig-docs">kubernetes-sig-docs</a> group and <a href="https://kubernetes.slack.com/messages/sig-docs/">kubernetes.slack.com #sig-docs</a> channel.</p>
<p>The user guides within this section are being refactored into topics within Tutorials, Tasks, and Concepts. Anything that has been moved will have a notice placed in its previous location as well as a link to its new location. The reorganization implements the table of contents (ToC) outlined in the <a href="https://docs.google.com/a/google.com/document/d/18hRCIorVarExB2eBVHTUR6eEJ2VVk5xq1iBmkQv8O6I/edit?usp=sharing">kubernetes-docs-toc</a> document and should improve the documentation's findability and readability for a wider range of audiences.</p>
<p>As of March 14, 2017, the Kubernetes SIG-Docs-Maintainers group have begun migration of the User Guide content as announced previously to the <a href="https://git.k8s.io/community/sig-docs">SIG Docs community</a> through the <a href="https://groups.google.com/forum/#!forum/kubernetes-sig-docs">kubernetes-sig-docs</a> group and <a href="https://kubernetes.slack.com/messages/sig-docs/">kubernetes.slack.com #sig-docs</a> channel.</p>
<p>The user guides within this section are being refactored into topics within Tutorials, Tasks, and Concepts. Anything that has been moved will have a notice placed in its previous location as well as a link to its new location. The reorganization implements a new table of contents and should improve the documentation's findability and readability for a wider range of audiences.</p>
<p>For any questions, please contact: <a href="mailto:kubernetes-sig-docs@googlegroups.com">kubernetes-sig-docs@googlegroups.com</a></p>
</td>
</tr>
+2
View File
@@ -38,6 +38,8 @@
</div>
</section>
{% include deprecation-warning.html %}
<section id="encyclopedia">
<div id="docsToc">
<div class="pi-accordion">
+328 -19
View File
@@ -258,12 +258,46 @@ ul.global-nav
left: 0
background: #fff
.ui-icon
filter: brightness(0) invert(1)
ul
display: none
position: fixed
top: 40px
text-align: left
li
display: block
height: 28px
a
background: $dark-grey
color: #fff
padding: 7px
li:last-child
a
border-radius: 7px
li:hover
ul
display: block
.flip-nav ul.global-nav li a,
.open-nav ul.global-nav li a,
color: #333
color: $dark-grey
.flip-nav ul.global-nav li a .ui-icon
filter: brightness(0)
.flip-nav ul.global-nav li ul li a,
background: #fff
color: $dark-grey
.flip-nav ul.global-nav li a.active:after,
.flip-nav ul.global-nav li ul li a.active:after,
.open-nav ul.global-nav li a.active:after,
background: $blue
@@ -864,6 +898,9 @@ dd
font-size: inherit
background-color: transparent
.includecode
table-layout: fixed
.includecode, .includecode th, .includecode td
padding: 0 !important
@@ -965,8 +1002,8 @@ dd
//font-weight: 700
text-decoration: underline
a:visited
color: blueviolet
// a:visited
// color: blueviolet
a.button
border-radius: 2px
@@ -1294,7 +1331,7 @@ $feature-box-div-margin-bottom: 40px
height: 30vw
max-width: 1200px
max-height: 450px
margin: 20px auto
margin: 20px auto
iframe
position: absolute
@@ -1302,6 +1339,270 @@ $feature-box-div-margin-bottom: 40px
width: 100%
height: 100%
// Dialog
.ui-icon
display: inline-block !important
#feature-state-dialog-link
text-decoration: none !important
padding: 5px !important
a:visited
color: #454545 !important
a code
display: inline-block !important
box-sizing: border-box !important
background-color: #f7f7f7 !important
color: #303030 !important
font-family: "Roboto Mono", monospace !important
vertical-align: baseline !important
font-size: 14px !important
font-weight: bold !important
padding: 0px 4px !important
#feature-state-dialog
background: #fff !important
border: 1px solid #ddd !important
padding: 0.5em 1em !important
ul, li
list-style: disc !important
margin: 4px 12px !important
p
margin: 8px 0px !important
code
display: inline-block !important
box-sizing: border-box !important
background-color: #f7f7f7 !important
color: #303030 !important
font-family: "Roboto Mono", monospace !important
vertical-align: baseline !important
font-size: 14px !important
font-weight: bold !important
padding: 0px 4px !important
.ui-dialog
background: #f7f7f7 !important
padding: 0.5em
.ui-dialog-content
position: relative
float: right
width: 100%
$toc-margin: 15px
$header-clearance: $header-height + 20px
* + h2, * + h3, * + h4, * + h5, * + h6
margin-top: 30px
h1, h2, h3, h4, h5, h6
line-height: normal
font-weight: 500
margin-bottom: 30px
padding-bottom: 10px
// Make sure anchor links aren't hidden by the header
&:before
display: block
content: " "
margin-top: -$header-clearance
height: $header-clearance
visibility: hidden
h1,h2
border-bottom: 1px solid #cccccc
h1
font-size: 32px
padding-right: 60px
h2
font-size: 28px
h3
font-size: 24px
font-weight: 300
margin-bottom: 5px
h4
font-size: 20px
margin-bottom: 0px
h5, h6
font-size: 16px
font-weight: 500
p
font-size: 16px
font-weight: 300
line-height: 1.75em
p + p
margin-top: 10px
code
display: inline-block
box-sizing: border-box
background-color: $light-grey
color: $dark-grey
font-family: $mono-font
vertical-align: baseline
font-size: 14px
font-weight: bold
padding: 2px 4px
a code
color: $blue
text-decoration: underline
pre .pi, pre .s
margin: 0
padding: 0
.highlight code span, code, pre code
font-family: "Roboto Mono", monospace
code, pre code
color: #303030
pre code
padding: 0
pre
background-color: #f7f7f7
display: block
margin: 20px 0
padding: 15px
position: relative
overflow-x: auto
h1 code, h2 code, h3 code, h4 code, h5 code, h6 code
font-family: inherit
font-size: inherit
background-color: transparent
.includecode
table-layout: fixed
.includecode, .includecode th, .includecode td
padding: 0 !important
.includecode th
text-align: right !important
padding: 10px !important
.includecode th a, .includecode th a code
color: white !important
background-color: transparent !important
.includecode pre
margin: 0 !important
ul li
list-style: disc
ol li
list-style: decimal
ul, ol
margin: 20px 0
padding-left: 30px
font-weight: 300
ul ul, ol ol, ul ol, ol ul
margin: 0.75em 0
li
margin-bottom: 0.75em
font-size: 16px
line-height: 1.75em
table
width: 100%
border: 1px solid #ccc
border-spacing: 0
margin-top: 30px
margin-bottom: 30px
thead, tr:nth-child(even)
background-color: $light-grey
thead
background-color: #555
color: white
th, td
padding: 8px
text-align: left
margin: 0
th
font-weight: normal
td
font-size: 0.85em
#editPageButton
position: absolute
top: -25px
right: 5px
width: 50px
height: 50px
line-height: 50px
border-radius: 50%
white-space: nowrap
text-indent: 50px
overflow: hidden
background: $blue url(/images/icon-pencil.svg) no-repeat
background-position: 12px 10px
background-size: 29px 29px
#markdown-toc
margin-bottom: 20px
ul, li
list-style: disc
color: $blue
ul
padding: 0 15px
margin: 0
li
padding: 0
line-height: 1.5em
margin-bottom: 0
a
position: relative
color: $blue
font-weight: 700
img
max-width: 100%
a
//font-weight: 700
text-decoration: underline
// a:visited
// color: blueviolet
a.button
border-radius: 2px
text-decoration: none
&:visited
color: white
a.issue
margin-left: 0px
.ui-dialog-buttonpane
background: #f7f7f7 !important
// Tabs
.ui-widget-header
background: transparent !important
@@ -1313,19 +1614,27 @@ $feature-box-div-margin-bottom: 40px
padding: 0px !important
list-style: none !important
margin-bottom: 0px !important
margin-left: 1px !important
margin-left: 4px !important
.ui-tabs-panel
ul li
list-style: disc !important
ol li
list-style: decimal !important
.ui-widget-content
border: 0px !important
.ui-widget-content
table
margin: 0px !important
.ui-tabs .ui-tabs-panel
padding: 0px !important
border: 1px solid #ccc !important
.ui-tabs-anchor
text-decoration: none !important
// Talk to us
#talkToUs
h3, h4
@@ -1432,18 +1741,18 @@ $feature-box-div-margin-bottom: 40px
//#bigSocial
// text-align: center
//
// div
// display: inline-block
// float: none
// padding-top: 125px
// width: calc(90%)
//
// a
// margin-top: 15px
// font-size: 18px
// text-align: center
//
// div
// display: inline-block
// float: none
// padding-top: 125px
// width: calc(90%)
//
// a
// margin-top: 15px
// font-size: 18px
//
//
//
//
//
+6
View File
@@ -0,0 +1,6 @@
.deprecation-warning {
padding: 20px;
margin: 20px 0;
border-radius: 3px;
background-color: #eeeeee;
}
+2 -2
View File
@@ -12,9 +12,9 @@ $( document ).ready(function() {
$("#generalInstructions").hide();
$("#continueEdit").show();
$("#continueEditButton").text("Edit " + forwarding);
$("#continueEditButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/edit/master/" + forwarding)
$("#continueEditButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/edit/{{ page.docsbranch }}/" + forwarding)
$("#viewOnGithubButton").text("View " + forwarding + " on GitHub");
$("#viewOnGithubButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/tree/master/" + forwarding)
$("#viewOnGithubButton").attr("href", "https://github.com/kubernetes/kubernetes.github.io/tree/{{ page.docsbranch }}/" + forwarding)
} else {
$("#generalInstructions").show();
$("#continueEdit").hide();
+2
View File
@@ -21,6 +21,8 @@ cid: home
<!--</div>-->
</section>
{% include deprecation-warning.html %}
<!-- OCEAN NODES -->
<section id="oceanNodes">
<main>