Skip to content

Commit

Permalink
Layout updates, dark themes, tons o stuff (#1971)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jsouth @johndmulhausen
jsouth authored and johndmulhausen committed Feb 24, 2017
1 parent 1b2a71b commit 12c2532
Show file tree
Hide file tree
Showing 16 changed files with 3,271 additions and 358 deletions.
5 changes: 2 additions & 3 deletions _includes/d4a_buttons.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<a href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-1" target="blank" class="aws-deploy">![Docker for AWS](https://s3.amazonaws.com/cloudformation-examples/cloudformation-launch-stack.png)</a>
{% endcapture %}
{% capture aws_blue_latest %}
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-1" target="blank">Deploy Docker for AWS (stable)</a>
<a class="button primary-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/stable/Docker.tmpl" data-rel="Stable-1" target="blank">Deploy Docker for AWS (stable)</a>
{% endcapture %}
{% capture aws_blue_beta %}
<a class="button darkblue-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl" data-rel="Beta-14" target="blank">Deploy Docker for AWS (beta)</a>
<a class="button primary-btn aws-deploy" href="https://console.aws.amazon.com/cloudformation/home#/stacks/new?stackName=Docker&templateURL=https://editions-us-east-1.s3.amazonaws.com/aws/edge/Docker.tmpl" data-rel="Beta-14" target="blank">Deploy Docker for AWS (beta)</a>
{% endcapture %}

{% capture azure_blue_latest %}
Expand All @@ -17,4 +17,3 @@
{% capture azure_button_latest %}
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fdownload.docker.com%2Fazure%2Fstable%2FDocker.tmpl" data-rel="Stable-1" target="_blank" class="azure-deploy">![Docker for Azure](http://azuredeploy.net/deploybutton.png)</a>
{% endcapture %}

41 changes: 21 additions & 20 deletions _includes/footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
<!-- NEED TO UPDATE FINAL SCRIPT FOR NEWSLETTER SIGNUP -->
<section class="newsletter_section">
<div class="container">
<form class="form-inline">
<div class="form-group">
<input type="email" class="form-control input" id="#add-id-here" placeholder="email address">
<button type="submit" class="outline-btn">Submit</button>
</div>
</form>
</div>
</section>

<!-- global footer -->
<!-- footer -->
<footer class="footer">
<!-- newsletter -->
<div class="newsletter_section">
<div class="container">
<div class="col-md-8">
<form class="form-inline">
<div class="form-group">
<input type="email" class="form-control input" placeholder="email address">
<button type="submit" class="button outline-btn newsletter">Submit</button>
</div>
</form>
</div>
</div>
</div>
<div class="container">
<div class="top_footer">
<div class="row">
Expand All @@ -30,18 +31,18 @@
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<ul class="footer_links links_2">
<ul class="footer_links">
<li><a href="https://www.docker.com/products/overview">Product</a></li>
<li><a href="https://www.docker.com/pricing">Pricing</a></li>
<li><a href="https://www.docker.com/docker-community">Community Edition</a></li>
<li><a href="https://www.docker.com/enterprise">Enterprise Edition </a></li>
<li><a href="https://www.docker.com/products/docker-datacenter">Docker Datacenter</a></li>
<li><a href="https://www.docker.com/products/docker-cloud">Docker Cloud</a></li>
<li><a href="https://docs.docker.com/docker-store/">Docker Store</a></li>
<li><a href="https://cloud.docker.com/">Docker Cloud</a></li>
<li><a href="https://store.docker.com/">Docker Store</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-3">
<ul class="footer_links links_3">
<ul class="footer_links">
<li><a href="https://www.docker.com/docker-mac">Docker for Mac </a></li>
<li><a href="https://www.docker.com/docker-windows">Docker for Windows(PC)</a></li>
<li><a href="https://www.docker.com/docker-aws" class="web30">Docker for AWS</a></li>
Expand All @@ -63,7 +64,7 @@
<li><a href="https://blog.docker.com" target="_blank">Blog</a></li>
<li><a href="https://training.docker.com/" target="_blank">Training</a></li>
<li><a href="https://www.docker.com/docker-support-services">Support</a></li>
<li><a href="https://www.docker.com/docker">KB</a></li>
<li><a href="https://success.docker.com/kbase">Knowledge Base</a></li>
<li><a href="https://www.docker.com/products/resources">Resources</a></li>
</ul>
</div>
Expand All @@ -75,7 +76,7 @@
<li><a href="https://forums.docker.com/" target="_blank">Forums</a></li>
<li><a href="https://www.docker.com/community/docker-captains">Docker Captians</a></li>
<li><a href="https://www.docker.com/docker-community/scholarships">Scholarships</a></li>
<li><a href="https://www.docker.com/company/news-and-press">Community News</a></li>
<li><a href="https://blog.docker.com/curated/">Community News</a></li>
</ul>
</div>
</div>
Expand Down Expand Up @@ -110,4 +111,4 @@
</div>
</div>
</footer>
<!-- / end footer -->
<!-- /end footer -->
139 changes: 87 additions & 52 deletions _includes/global-header.html
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
<header class="header">
<div class="header">
<div class="fan"></div>
<div class="container">
<div class="row">
<nav class="nav-primary">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<img class="logo" src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs">
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="primary nav navbar-nav">
<li><a href="https://docker.com/what-docker">What is Docker?</a></li>
<li><a href="https://docker.com/get-docker">Product</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Get Docker <span class="caret"></span></a>
<ul class="dropdown-menu nav-main">
<h6 class="dropdown-header">For Desktops</h6>
<li><a href="https://docker.com/docker-mac">Mac</a></li>
<li><a href="https://docker.com/docker-windows">Windows</a></li>
<h6 class="dropdown-header">For Cloud Providers</h6>
<li><a href="https://docker.com/docker-aws">AWS</a></li>
<li><a href="https://docker.com/docker-microsoft-azure">Azure</a></li>
<h6 class="dropdown-header">For Servers</h6>
<li><a href="https://docker.com/docker-windows-server">Windows Server</a></li>
<li><a href="https://docker.com/docker-centos">CentOS</a></li>
<li><a href="https://docker.com/docker-debian">Debian</a></li>
<li><a href="https://docker.com/docker-fedora">Fedora</a></li>
<li><a href="https://docker.com/docker-oracle-linux">Oracle Enterprise Linux</a></li>
<li><a href="https://docker.com/docker-rhel">RHEL</a></li>
<li><a href="https://docker.com/docker-sles">SLES</a></li>
<li><a href="https://docker.com/docker-ubuntu">Ubuntu</a></li>
</ul>
</li>
<li><a href="https://docs.docker.com">Docs</a></li>
<li><a href="https://forums.docker.com">Community</a></li>
</ul>
<ul class="nav navbar-nav navbar-right user-nav">
<li><a href="https://cloud.docker.com/">Create Docker ID</a></li>
<li><a href="https://cloud.docker.com/login">Sign In</a></li>
</ul>
</div>
<!--/.nav-collapse -->
</div>
</nav>
</div>
<div class="row">
<nav class="nav-primary">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<img class="logo" src="../images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs">
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="primary nav navbar-nav">
<li><a href="https://docker.com/what-docker">What is Docker?</a></li>
<li><a href="https://docker.com/get-docker">Product</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Get Docker <span class="caret"></span></a>
<ul class="dropdown-menu nav-main">
<h6 class="dropdown-header">For Desktops</h6>
<li><a href="https://docker.com/docker-mac">Mac</a></li>
<li><a href="https://docker.com/docker-windows">Windows</a></li>
<h6 class="dropdown-header">For Cloud Providers</h6>
<li><a href="https://docker.com/docker-aws">AWS</a></li>
<li><a href="https://docker.com/docker-microsoft-azure">Azure</a></li>
<h6 class="dropdown-header">For Servers</h6>
<li><a href="https://docker.com/docker-windows-server">Windows Server</a></li>
<li><a href="https://docker.com/docker-centos">CentOS</a></li>
<li><a href="https://docker.com/docker-debian">Debian</a></li>
<li><a href="https://docker.com/docker-fedora">Fedora</a></li>
<li><a href="https://docker.com/docker-oracle-linux">Oracle Enterprise Linux</a></li>
<li><a href="https://docker.com/docker-rhel">RHEL</a></li>
<li><a href="https://docker.com/docker-sles">SLES</a></li>
<li><a href="https://docker.com/docker-ubuntu">Ubuntu</a></li>
</ul>
</li>
<li><a href="https://docs.docker.com">Docs</a></li>
<li><a href="https://docker.com/docker-community">Community</a></li>
</ul>
<ul class="nav navbar-nav navbar-right user-nav">
<li><a href="https://cloud.docker.com/">Create Docker ID</a></li>
<li><a href="https://cloud.docker.com/login">Sign In</a></li>
</ul>
</div>
<!--/.nav-collapse -->
</div>
</nav>
</div>
</div>
<!-- hero banner text -->
<div class="container">
Expand All @@ -57,11 +57,46 @@ <h6 class="dropdown-header">For Servers</h6>
<div class="hero-text-centered">
<h1>Docker's Documentation</h1>
<p>Docker provides a way to run applications securely isolated in a container, packaged with all its dependencies and libraries.</p>
<ul>
<li><a class="button transparent-btn" href="#">Looking for Support</a></li>
<li> <a class="button secondary-btn" href="#">Get Training</a></li>
<ul class="buttons">
<li><a class="button transparent-btn" href="https://support.docker.com" target="_blank">Looking for Support</a></li>
<li> <a class="button secondary-btn" href="https://training.docker.com" target="_blank">Get Training</a></li>
</ul>
</div>
</div>
</div>
</div>
<!-- nav-secondary -->
<nav class="nav-secondary-tabs" data-spy="affix" data-offset-top="490">
<div class="container-fluid">
<!-- <div class="affix-logo">
<img class="logo" src="../images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs">
</div> -->
<div class="search-form">
<form class="search-form form-inline ng-pristine ng-valid" id="searchForm" action="/search/">
<input class="search-field form-control ds-input" id="st-search-input" value="" name="q" placeholder="Search the docs" type="search" autocomplete="off" spellcheck="false" dir="auto" style="position: relative; vertical-align: top;">
<div id="autocompleteContainer">
<div id="autocompleteResults"></div>
</div>
<!-- <button type="submit" class="search-submit btn btn-default">Search</button> -->
</form>
</div>
<div id="tabs">
<ul class="tabs nav navbar-nav navbar-left">
{% include treebuilder.html %}
</ul>
</div>
<div class="ctrl-right">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Docker 1.13 <span class="caret"></span>
</button>
<ul class="dropdown-menu">
{% for item in site.data.docsarchive.docker-compose %}
<li><a href="/{{ item[0] }}/">Docker {{ item[0] }}</a></li>
{% endfor %}
</ul>
</div>
</div>
</div>
</nav>
</div>
8 changes: 4 additions & 4 deletions _includes/header.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

<div id="navbar" class="navbar-collapse collapse" aria-expanded="false" style="height: 1px;">
<div class="search-form" id="search-div">
<form class="navbar-form navbar-left">
<!-- <input type="text" class="form-control" id ="search" placeholder="Search Documentation"> -->
<form>
<form class="search-form form-inline ng-pristine ng-valid" id="searchForm" action="/search/">
<input class="search-field form-control ds-input" id="st-search-input" value="" name="q" placeholder="Search the docs" type="search" autocomplete="off" spellcheck="false" dir="auto" style="position: relative; vertical-align: top;">
<div id="autocompleteContainer">
Expand All @@ -35,8 +34,9 @@
Docker 1.13 <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="#">Docker 1.12</a></li>
<li><a href="#">Docker 1.11</a></li>
{% for item in site.data.docsarchive.docker-compose %}
<li><a href="/{{ item[0] }}/">Docker {{ item[0] }}</a></li>
{% endfor %}
</ul>
</div>
</div>
Expand Down
1 change: 0 additions & 1 deletion _includes/side-menu.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,4 @@
<ul class="nav navbar-collapse" id="stacked-menu">
{{ leftnav }}
</ul>
<!-- end sidebar nav -->
</div>
2 changes: 1 addition & 1 deletion _includes/tree.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% for item in tree %}
{% if item.sectiontitle %}{% if foundBranch=="false" %}{% capture treeString %}{{ item.section | downcase }}{% endcapture %}{% capture pageURLString %}"{{ page.url }}"{% endcapture %}{% else %}{% assign treeString="" %}{% endif %}
<li><a data-target="#item{{ forloop.index }}" data-toggle="collapse" data-parent="#stacked-menu"{% if treeString contains pageURLString %}{% assign foundBranch="true"%} class="active" aria-expanded="true"{% else %} class="collapsed" aria-expanded="false"{% endif %}>{{ item.sectiontitle }}<span class="caret arrow"></span></a>
<ul class="nav collapse{% if foundBranch == "true" %} in{% endif %}" id="#item{{ forloop.index }}" aria-expanded="{% if foundBranch == "true" %}true{% else %}false{% endif %}">{% assign tree = item.section %}{% include tree.html %}</ul>
<ul class="nav collapse{% if foundBranch == "true" %}{% endif %}" id="#item{{ forloop.index }}" aria-expanded="{% if foundBranch == "true" %}true{% else %}false{% endif %}">{% assign tree = item.section %}{% include tree.html %}</ul>
</li>
{% else %}
<li><a href="{{ item.path }}"{% if item.path == page.url and item.nosync != true %} class="active currentPage"{% endif %}>{{ item.title }}</a></li>
Expand Down
Loading

0 comments on commit 12c2532

Please sign in to comment.