Merge branch 'master' of https://github.com/kubernetes/kubernetes.github.io into release-1.7
* 'master' of https://github.com/kubernetes/kubernetes.github.io: Add deprecation tag (#3922)reviewable/pr3971/r1
Andrew Chen
commit
726b147b72
|
|
@ -1,5 +1,5 @@
|
|||
<a href="#" id="feature-state-dialog-link" class="ui-state-default ui-corner-all"><span class="ui-icon ui-icon-newwin"></span>{{ dialog_title }}</a>
|
||||
<div id="feature-state-dialog" title="{{ dialog_title }}">
|
||||
<div id="feature-state-dialog" class="ui-dialog-content" title="{{ dialog_title }}">
|
||||
{{ dialog_content | markdownify }}
|
||||
</div>
|
||||
{% raw %}<script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
{% assign dialog_title = "deprecated" %}
|
||||
{% capture dialog_content %}
|
||||
This feature is *deprecated*. See [Deprecating parts of the API](/docs/reference/deprecation-policy/#deprecating-parts-of-the-api) for more information.
|
||||
{% endcapture %}
|
||||
|
||||
**DEPRECATION NOTICE:** As of `Kubernetes {{ for_k8s_version | default: page.version }}` this feature is {% include feature-dialog.md %}
|
||||
216
_sass/_base.sass
216
_sass/_base.sass
|
|
@ -1311,7 +1311,7 @@ $feature-box-div-margin-bottom: 40px
|
|||
|
||||
#feature-state-dialog-link
|
||||
text-decoration: none !important
|
||||
padding: 6px !important
|
||||
padding: 5px !important
|
||||
a:visited
|
||||
color: #454545 !important
|
||||
a code
|
||||
|
|
@ -1352,6 +1352,220 @@ $feature-box-div-margin-bottom: 40px
|
|||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@ assignees:
|
|||
title: DCOS
|
||||
---
|
||||
|
||||
{% assign for_k8s_version="1.6" %}{% include feature-state-deprecated.md %}
|
||||
|
||||
This guide will walk you through installing [Kubernetes-Mesos](https://github.com/mesosphere/kubernetes-mesos) on [Datacenter Operating System (DCOS)](https://mesosphere.com/product/) with the [DCOS CLI](https://github.com/mesosphere/dcos-cli) and operating Kubernetes with the [DCOS Kubectl plugin](https://github.com/mesosphere/dcos-kubectl).
|
||||
|
||||
* TOC
|
||||
|
|
|
|||
Loading…
Reference in New Issue