Newsite tabs (docker#2004)

* Layout updates, dark themes, tons o stuff * Update themes Theme updates + scaffolding
marlic7 · Feb 27, 2017 · e88f2b2 · e88f2b2
1 parent 20c91a5
commit e88f2b2
Show file tree

Hide file tree

Showing 12 changed files with 2,758 additions and 2,040 deletions.
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,5 +1,3 @@
-<!-- footer -->
-<footer class="footer">
   <!-- newsletter -->
   <div class="newsletter_section">
       <div class="container">
@@ -23,7 +21,7 @@
                         <li><a href="https://www.docker.com/use-cases">Use Cases</a></li>
                         <li><a href="https://www.docker.com/customers">Customers</a></li>
                         <li><a href="https://www.docker.com/partners/partner-program">Partners</a></li>
-                        <li><a href="https://www.docker.com/industry-government">For Government</a></li>
+                        <li class="break"><a href="https://www.docker.com/industry-government">For Government</a></li>
                         <li><a href="https://www.docker.com/company">About Docker</a></li>
                         <li><a href="https://www.docker.com/company/management">Management</a></li>
                         <li><a href="https://www.docker.com/company/news-and-press">Press &amp; News</a></li>
@@ -35,7 +33,7 @@
                         <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 class="break"><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://cloud.docker.com/">Docker Cloud</a></li>
                         <li><a href="https://store.docker.com/">Docker Store</a></li>
@@ -44,13 +42,13 @@
                 <div class="col-xs-12 col-sm-3 col-md-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 class="break"><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>
-                        <li><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
+                        <li class="break"><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
                         <li><a href="https://www.docker.com/docker-windows-server">Docker for Windows Server</a></li>
-                        <li><a href="https://www.docker.com/docker-centos">Docker for CentOS</a></li>
+                        <li><a href="https://www.docker.com/docker-centos">Docker for CentOS distribution</a></li>
                         <li><a href="https://www.docker.com/docker-debian">Docker for Debian</a></li>
-                        <li><a href="https://www.docker.com/docker-fedora">Docker for Fedora</a></li>
+                        <li><a href="https://www.docker.com/docker-fedora">Docker for Fedora&#x00AE</a></li>
                         <li><a href="https://www.docker.com/docker-oracle-linux">Docker for Oracle Enterprise Linux</a></li>
                         <li><a href="https://www.docker.com/docker-rhel">Docker for RHEL</a></li>
                         <li><a href="https://www.docker.com/docker-sles">Docker for SLES</a></li>
@@ -110,5 +108,3 @@
             </div>
         </div>
     </div>
-</footer>
-<!-- /end footer -->
diff --git a/_includes/global-header.html b/_includes/global-header.html
@@ -81,7 +81,7 @@ <h1>Docker's Documentation</h1>
                 </form>
             </div>
             <div id="tabs">
-                <ul class="tabs nav navbar-nav navbar-left">
+                <ul class="tabs nav navbar-nav navbar-collapse collapse navbar-left">
                   {% include treebuilder.html %}
                 </ul>
             </div>

diff --git a/_includes/header.html b/_includes/header.html
@@ -1,5 +1,8 @@
-<nav class="nav-secondary navbar navbar-default navbar-fixed-top">
+<nav class="nav-secondary navbar navbar-fixed-top">
     <div class="container-fluid">
+      <!-- <div class="ctrl-left">
+        <a href="javascript:void(0)" id="menu-toggle-left"><i class="fa fa-outdent" aria-hidden="true"></i></a>
+      </div> -->
         <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>
@@ -9,7 +12,6 @@
             </button>
                   <a href="/"><img class="logo" src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs"></a>
         </div>
-
           <div id="navbar" class="navbar-collapse collapse" aria-expanded="false" style="height: 1px;">
               <div class="search-form" id="search-div">
                   <form>
@@ -27,8 +29,7 @@
                   </ul>
               </div>
               <div class="ctrl-right">
-                  <a href="javascript:void(0)" id="menu-toggle"><i class="fa fa-outdent" aria-hidden="true"></i></a>
-                  <!-- varsion -->
+                  <a href="javascript:void(0)" id="menu-toggle"><i class="fa fa-indent" aria-hidden="true"></i></a>
                   <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>

diff --git a/_includes/side-menu.html b/_includes/side-menu.html
@@ -1,4 +1,4 @@
-<div class="nav-sidebar navbar-collapse collapse">
+{% if page.landing == true %}<div class="nav-sidebar navbar-collapse collapse affix" data-spy="affix" data-offset-top="490">{%else%}<div class="nav-sidebar navbar-collapse collapse">{% endif %}
     <ul class="nav navbar-collapse" id="stacked-menu">
       {{ leftnav }}
     </ul>