Skip to content

Commit e88f2b2

Browse files
jsouthjohndmulhausen
authored andcommitted
Newsite tabs (#2004)
* Layout updates, dark themes, tons o stuff * Update themes Theme updates + scaffolding
1 parent 20c91a5 commit e88f2b2

File tree

12 files changed

+2758
-2040
lines changed

12 files changed

+2758
-2040
lines changed

_includes/footer.html

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
<!-- footer -->
2-
<footer class="footer">
31
<!-- newsletter -->
42
<div class="newsletter_section">
53
<div class="container">
@@ -23,7 +21,7 @@
2321
<li><a href="https://www.docker.com/use-cases">Use Cases</a></li>
2422
<li><a href="https://www.docker.com/customers">Customers</a></li>
2523
<li><a href="https://www.docker.com/partners/partner-program">Partners</a></li>
26-
<li><a href="https://www.docker.com/industry-government">For Government</a></li>
24+
<li class="break"><a href="https://www.docker.com/industry-government">For Government</a></li>
2725
<li><a href="https://www.docker.com/company">About Docker</a></li>
2826
<li><a href="https://www.docker.com/company/management">Management</a></li>
2927
<li><a href="https://www.docker.com/company/news-and-press">Press &amp; News</a></li>
@@ -35,7 +33,7 @@
3533
<li><a href="https://www.docker.com/products/overview">Product</a></li>
3634
<li><a href="https://www.docker.com/pricing">Pricing</a></li>
3735
<li><a href="https://www.docker.com/docker-community">Community Edition</a></li>
38-
<li><a href="https://www.docker.com/enterprise">Enterprise Edition </a></li>
36+
<li class="break"><a href="https://www.docker.com/enterprise">Enterprise Edition </a></li>
3937
<li><a href="https://www.docker.com/products/docker-datacenter">Docker Datacenter</a></li>
4038
<li><a href="https://cloud.docker.com/">Docker Cloud</a></li>
4139
<li><a href="https://store.docker.com/">Docker Store</a></li>
@@ -44,13 +42,13 @@
4442
<div class="col-xs-12 col-sm-3 col-md-3">
4543
<ul class="footer_links">
4644
<li><a href="https://www.docker.com/docker-mac">Docker for Mac </a></li>
47-
<li><a href="https://www.docker.com/docker-windows">Docker for Windows(PC)</a></li>
45+
<li class="break"><a href="https://www.docker.com/docker-windows">Docker for Windows(PC)</a></li>
4846
<li><a href="https://www.docker.com/docker-aws" class="web30">Docker for AWS</a></li>
49-
<li><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
47+
<li class="break"><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
5048
<li><a href="https://www.docker.com/docker-windows-server">Docker for Windows Server</a></li>
51-
<li><a href="https://www.docker.com/docker-centos">Docker for CentOS</a></li>
49+
<li><a href="https://www.docker.com/docker-centos">Docker for CentOS distribution</a></li>
5250
<li><a href="https://www.docker.com/docker-debian">Docker for Debian</a></li>
53-
<li><a href="https://www.docker.com/docker-fedora">Docker for Fedora</a></li>
51+
<li><a href="https://www.docker.com/docker-fedora">Docker for Fedora&#x00AE</a></li>
5452
<li><a href="https://www.docker.com/docker-oracle-linux">Docker for Oracle Enterprise Linux</a></li>
5553
<li><a href="https://www.docker.com/docker-rhel">Docker for RHEL</a></li>
5654
<li><a href="https://www.docker.com/docker-sles">Docker for SLES</a></li>
@@ -110,5 +108,3 @@
110108
</div>
111109
</div>
112110
</div>
113-
</footer>
114-
<!-- /end footer -->

_includes/global-header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ <h1>Docker's Documentation</h1>
8181
</form>
8282
</div>
8383
<div id="tabs">
84-
<ul class="tabs nav navbar-nav navbar-left">
84+
<ul class="tabs nav navbar-nav navbar-collapse collapse navbar-left">
8585
{% include treebuilder.html %}
8686
</ul>
8787
</div>

_includes/header.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
<nav class="nav-secondary navbar navbar-default navbar-fixed-top">
1+
<nav class="nav-secondary navbar navbar-fixed-top">
22
<div class="container-fluid">
3+
<!-- <div class="ctrl-left">
4+
<a href="javascript:void(0)" id="menu-toggle-left"><i class="fa fa-outdent" aria-hidden="true"></i></a>
5+
</div> -->
36
<div class="navbar-header">
47
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
58
<span class="sr-only">Toggle navigation</span>
@@ -9,7 +12,6 @@
912
</button>
1013
<a href="/"><img class="logo" src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs"></a>
1114
</div>
12-
1315
<div id="navbar" class="navbar-collapse collapse" aria-expanded="false" style="height: 1px;">
1416
<div class="search-form" id="search-div">
1517
<form>
@@ -27,8 +29,7 @@
2729
</ul>
2830
</div>
2931
<div class="ctrl-right">
30-
<a href="javascript:void(0)" id="menu-toggle"><i class="fa fa-outdent" aria-hidden="true"></i></a>
31-
<!-- varsion -->
32+
<a href="javascript:void(0)" id="menu-toggle"><i class="fa fa-indent" aria-hidden="true"></i></a>
3233
<div class="btn-group">
3334
<button type="button" class="btn btn-default dropdown-btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
3435
Docker 1.13 <span class="caret"></span>

_includes/side-menu.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="nav-sidebar navbar-collapse collapse">
1+
{% 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 %}
22
<ul class="nav navbar-collapse" id="stacked-menu">
33
{{ leftnav }}
44
</ul>

0 commit comments

Comments
 (0)