mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Modified the navigation in both website and documentaion to include the Blog.
This commit is contained in:
parent
d7a6485dfe
commit
716892b95d
5 changed files with 145 additions and 52 deletions
30
docs/theme/docker/layout.html
vendored
30
docs/theme/docker/layout.html
vendored
|
@ -64,14 +64,15 @@
|
||||||
|
|
||||||
<div style="float: right" class="pull-right">
|
<div style="float: right" class="pull-right">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li><a href="http://www.docker.io/">Introduction</a></li>
|
<li id="nav-introduction"><a href="http://www.docker.io/">Introduction</a></li>
|
||||||
<li><a href="http://www.docker.io/gettingstarted/">Getting started</a></li>
|
<li id="nav-gettingstarted"><a href="http://www.docker.io/gettingstarted/">Getting started</a></li>
|
||||||
<li class="active"><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
|
<li id="nav-documentation" class="active"><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
|
||||||
|
<li id="nav-blog"><a href="http://blog.docker.io/">Blog</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
|
<!--<div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">-->
|
||||||
<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
|
<!--<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>-->
|
||||||
<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
|
<!--<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>-->
|
||||||
</div>
|
<!--</div>-->
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="margin-left: -12px; float: left;">
|
<div style="margin-left: -12px; float: left;">
|
||||||
|
@ -86,8 +87,13 @@
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12 titlebar"><h1 class="pageheader">DOCUMENTATION</h1>
|
<div class="span12 titlebar">
|
||||||
<!--<span class="pull-right" style="margin-left: 20px; font-size: 20px">{{version}}</span>-->
|
<!--<span class="pull-right" style="margin-left: 20px; font-size: 20px">{{version}}</span>-->
|
||||||
|
<div class="pull-right" id="fork-us" style="margin-top: 16px; margin-right: 16px;">
|
||||||
|
<a href="http://github.com/dotcloud/docker/"><img src="{{ pathto('_static/img/fork-us.png', 1) }}"> Fork us on Github</a>
|
||||||
|
</div>
|
||||||
|
<h1 class="pageheader">DOCUMENTATION</h1>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -123,8 +129,14 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
||||||
<div class="span12 footer">
|
<div class="span12 footer">
|
||||||
|
<div class="tbox textright forceleftmargin social links pull-right">
|
||||||
|
<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
|
||||||
|
<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
|
Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
|
||||||
|
|
||||||
|
|
||||||
{# {%- if show_source and has_source and sourcename %}#}
|
{# {%- if show_source and has_source and sourcename %}#}
|
||||||
{# ·#}
|
{# ·#}
|
||||||
{# <a href="{{ pathto('_sources/' + sourcename, true)|e }}"#}
|
{# <a href="{{ pathto('_sources/' + sourcename, true)|e }}"#}
|
||||||
|
@ -157,7 +169,7 @@
|
||||||
<!-- script which should be loaded after everything else -->
|
<!-- script which should be loaded after everything else -->
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
||||||
|
// Function to make the sticky header possible
|
||||||
var shiftWindow = function() {
|
var shiftWindow = function() {
|
||||||
scrollBy(0, -70);
|
scrollBy(0, -70);
|
||||||
console.log("window shifted")
|
console.log("window shifted")
|
||||||
|
|
41
docs/theme/docker/static/css/main.css
vendored
41
docs/theme/docker/static/css/main.css
vendored
|
@ -285,6 +285,40 @@ section.header {
|
||||||
.social .github {
|
.social .github {
|
||||||
background-position: -59px 2px;
|
background-position: -59px 2px;
|
||||||
}
|
}
|
||||||
|
#fork-us {
|
||||||
|
/*font-family: 'Maven Pro';*/
|
||||||
|
|
||||||
|
/*font-weight: bold;*/
|
||||||
|
|
||||||
|
font-size: 12px;
|
||||||
|
/*text-transform: uppercase;*/
|
||||||
|
|
||||||
|
display: block;
|
||||||
|
padding: 0px 1em;
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
background-color: #43484c;
|
||||||
|
filter: progid:dximagetransform.microsoft.gradient(gradientType=0, startColorstr='#FFFF6E56', endColorstr='#FFED4F35');
|
||||||
|
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #747474), color-stop(100%, #43484c));
|
||||||
|
background-image: -webkit-linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
background-image: -moz-linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
background-image: -o-linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
background-image: linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
border: 1px solid #43484c;
|
||||||
|
-webkit-border-radius: 4px;
|
||||||
|
-moz-border-radius: 4px;
|
||||||
|
-ms-border-radius: 4px;
|
||||||
|
-o-border-radius: 4px;
|
||||||
|
border-radius: 4px;
|
||||||
|
-webkit-box-shadow: inset rgba(255, 255, 255, 0.17) 0 1px 1px;
|
||||||
|
-moz-box-shadow: inset rgba(255, 255, 255, 0.17) 0 1px 1px;
|
||||||
|
box-shadow: inset rgba(255, 255, 255, 0.17) 0 1px 1px;
|
||||||
|
margin: 8px;
|
||||||
|
}
|
||||||
|
#fork-us a {
|
||||||
|
color: #faf2ee;
|
||||||
|
text-shadow: rgba(0, 0, 0, 0.3) 0px 1px 0px;
|
||||||
|
}
|
||||||
/* =======================
|
/* =======================
|
||||||
Media size overrides
|
Media size overrides
|
||||||
======================= */
|
======================= */
|
||||||
|
@ -325,10 +359,15 @@ section.header {
|
||||||
|
|
||||||
padding-top: 600px;
|
padding-top: 600px;
|
||||||
}
|
}
|
||||||
|
#fork-us {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* Landscape phones and down */
|
/* Landscape phones and down */
|
||||||
@media (max-width: 480px) {
|
@media (max-width: 480px) {
|
||||||
|
#nav-gettingstarted {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
/* Misc fixes */
|
/* Misc fixes */
|
||||||
table th {
|
table th {
|
||||||
|
|
41
docs/theme/docker/static/css/main.less
vendored
41
docs/theme/docker/static/css/main.less
vendored
|
@ -391,6 +391,38 @@ section.header {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#fork-us {
|
||||||
|
/*font-family: 'Maven Pro';*/
|
||||||
|
/*font-weight: bold;*/
|
||||||
|
font-size: 12px;
|
||||||
|
/*text-transform: uppercase;*/
|
||||||
|
display: block;
|
||||||
|
padding: 0px 1em;
|
||||||
|
height: 28px;
|
||||||
|
line-height: 28px;
|
||||||
|
background-color: #43484c;
|
||||||
|
filter: progid:DXImageTransform.Microsoft.gradient(gradientType=0, startColorstr='#FFFF6E56', endColorstr='#FFED4F35');
|
||||||
|
background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #747474), color-stop(100%, #43484c));
|
||||||
|
background-image: -webkit-linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
background-image: -moz-linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
background-image: -o-linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
background-image: linear-gradient(top, #747474 0%, #43484c 100%);
|
||||||
|
border: 1px solid #43484c;
|
||||||
|
-webkit-border-radius: 4px;
|
||||||
|
-moz-border-radius: 4px;
|
||||||
|
-ms-border-radius: 4px;
|
||||||
|
-o-border-radius: 4px;
|
||||||
|
border-radius: 4px;
|
||||||
|
-webkit-box-shadow: inset rgba(255, 255, 255, 0.17) 0 1px 1px;
|
||||||
|
-moz-box-shadow: inset rgba(255, 255, 255, 0.17) 0 1px 1px;
|
||||||
|
box-shadow: inset rgba(255, 255, 255, 0.17) 0 1px 1px;
|
||||||
|
margin: 8px;
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #faf2ee;
|
||||||
|
text-shadow: rgba(0, 0, 0, 0.3) 0px 1px 0px;
|
||||||
|
}
|
||||||
|
}
|
||||||
/* =======================
|
/* =======================
|
||||||
Media size overrides
|
Media size overrides
|
||||||
======================= */
|
======================= */
|
||||||
|
@ -441,14 +473,17 @@ section.header {
|
||||||
/* TODO: Fix this to be relative to the navigation size */
|
/* TODO: Fix this to be relative to the navigation size */
|
||||||
padding-top: 600px;
|
padding-top: 600px;
|
||||||
}
|
}
|
||||||
|
#fork-us {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Landscape phones and down */
|
/* Landscape phones and down */
|
||||||
@media (max-width: 480px) {
|
@media (max-width: 480px) {
|
||||||
|
#nav-gettingstarted {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Misc fixes */
|
/* Misc fixes */
|
||||||
|
|
|
@ -34,15 +34,11 @@
|
||||||
|
|
||||||
<div style="float: right" class="pull-right">
|
<div style="float: right" class="pull-right">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li><a href="../">Introduction</a></li>
|
<li id="nav-introduction"><a href="../">Introduction</a></li>
|
||||||
<li class="active"><a href="">Getting started</a></li>
|
<li id="nav-gettingstarted" class="active"><a href="">Getting started</a></li>
|
||||||
<li class=""><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
|
<li id="nav-documentation" class=""><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
|
||||||
|
<li id="nav-blog"><a href="http://blog.docker.io/">Blog</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
|
|
||||||
<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
|
|
||||||
<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div style="margin-left: -12px; float: left;">
|
<div style="margin-left: -12px; float: left;">
|
||||||
|
@ -55,8 +51,16 @@
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12 titlebar"><h1 class="pageheader">GETTING STARTED</h1>
|
|
||||||
|
<div class="span12 titlebar">
|
||||||
|
|
||||||
|
<div class="pull-right" id="fork-us" style="margin-top: 16px; margin-right: 16px;">
|
||||||
|
<a href="http://github.com/dotcloud/docker/"><img src="../static/img/fork-us.png"> Fork us on Github</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<h1 class="pageheader"> GETTING STARTED</h1>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
@ -172,7 +176,10 @@
|
||||||
<footer id="footer" class="footer">
|
<footer id="footer" class="footer">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12 social">
|
<div class="span12 social">
|
||||||
|
<div class="tbox textright forceleftmargin social links pull-right">
|
||||||
|
<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
|
||||||
|
<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
|
||||||
|
</div>
|
||||||
Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
|
Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -44,9 +44,18 @@
|
||||||
.debug {
|
.debug {
|
||||||
border: 1px red dotted;
|
border: 1px red dotted;
|
||||||
}
|
}
|
||||||
|
.twitterblock {
|
||||||
|
min-height: 75px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.twitterblock img {
|
||||||
|
float: left;
|
||||||
|
margin-right: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
|
|
||||||
|
@ -56,17 +65,18 @@
|
||||||
<div class="navbar-dotcloud">
|
<div class="navbar-dotcloud">
|
||||||
<div class="container" style="text-align: center;">
|
<div class="container" style="text-align: center;">
|
||||||
|
|
||||||
|
|
||||||
|
<div class="pull-left" id="fork-us" style="margin-top: 16px;">
|
||||||
|
<a href="http://github.com/dotcloud/docker/"><img src="static/img/fork-us.png" alt="fork-icon"> Fork us on Github</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="pull-right" >
|
<div class="pull-right" >
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="active"><a href="/">Introduction</a></li>
|
<li id="nav-introduction" class="active"><a href="/">Introduction</a></li>
|
||||||
<li ><a href="gettingstarted">Getting started</a></li>
|
<li id="nav-gettingstarted"><a href="gettingstarted">Getting started</a></li>
|
||||||
<li class=""><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
|
<li id="nav-documentation" class=""><a href="http://docs.docker.io/en/latest/">Documentation</a></li>
|
||||||
|
<li id="nav-blog"><a href="http://blog.docker.io/">Blog</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<div class="social links" style="float: right; margin-top: 14px; margin-left: 12px">
|
|
||||||
<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
|
|
||||||
<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -81,7 +91,7 @@
|
||||||
|
|
||||||
<div class="span5" style="margin-bottom: 15px;">
|
<div class="span5" style="margin-bottom: 15px;">
|
||||||
<div style="text-align: center;" >
|
<div style="text-align: center;" >
|
||||||
<img src="static/img/docker_letters_500px.png">
|
<img src="static/img/docker_letters_500px.png" alt="docker letters">
|
||||||
|
|
||||||
<h2>The Linux container engine</h2>
|
<h2>The Linux container engine</h2>
|
||||||
</div>
|
</div>
|
||||||
|
@ -130,7 +140,7 @@
|
||||||
<section class="contentblock">
|
<section class="contentblock">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="span2" style="margin-left: 0" >
|
<div class="span2" style="margin-left: 0" >
|
||||||
<a href="http://dotcloud.theresumator.com/apply/mWjkD4/Software-Engineer.html" title="Job description"><img src="static/img/hiring_graphic.png" width="140px" style="margin-top: 25px"></a>
|
<a href="http://dotcloud.theresumator.com/apply/mWjkD4/Software-Engineer.html" title="Job description"><img src="static/img/hiring_graphic.png" alt="we're hiring" width="140" style="margin-top: 25px"></a>
|
||||||
</div>
|
</div>
|
||||||
<div class="span4" style="margin-left: 0">
|
<div class="span4" style="margin-left: 0">
|
||||||
<h4>Do you think it is cool to hack on docker? Join us!</h4>
|
<h4>Do you think it is cool to hack on docker? Join us!</h4>
|
||||||
|
@ -156,7 +166,7 @@
|
||||||
</div>
|
</div>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<input type="button" class="searchbutton" type="submit" value="Search images"
|
<input type="button" class="searchbutton" value="Search images"
|
||||||
onClick="window.open('https://index.docker.io')" />
|
onClick="window.open('https://index.docker.io')" />
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
@ -184,19 +194,6 @@
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
|
||||||
.twitterblock {
|
|
||||||
min-height: 75px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.twitterblock img {
|
|
||||||
float: left;
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
@ -317,7 +314,10 @@
|
||||||
<footer id="footer" class="footer">
|
<footer id="footer" class="footer">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
|
<div class="tbox textright forceleftmargin social links pull-right">
|
||||||
|
<a class="twitter" href="http://twitter.com/getdocker">Twitter</a>
|
||||||
|
<a class="github" href="https://github.com/dotcloud/docker/">GitHub</a>
|
||||||
|
</div>
|
||||||
Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
|
Docker is a project by <a href="http://www.dotcloud.com">dotCloud</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue