Skip to content

Commit

Permalink
CSS fixes for version selector, removing animations, and more (docker…
Browse files Browse the repository at this point in the history
…#5574)

This commit squashes 21 commits. Leaving the commit messages here for posterity.

* Activate Night Mode

- Add toggle for night mode
- Update base styles

* remove font-size

* Update _night-mode.scss

* Fix first-line indenting and color differences

* Fix rescale bug

* stuff

* Add menu fixs

* Update core pallette - light/dark mode

* Toc link padding

* Remove color cycle
Remove temp.css

* update secondary nav bg

* remove paddin-top ul left nav on med viewport
  • Loading branch information
jsouth authored and Misty Stanley-Jones committed Jan 18, 2018
1 parent ead81f5 commit c02ffd6
Show file tree
Hide file tree
Showing 13 changed files with 403 additions and 454 deletions.
24 changes: 4 additions & 20 deletions _includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<div class="container">
<div class="top_footer">
<div class="row">
<div class="col-xs-12 col-sm-3 col-md-2">
<div class="col-xs-12 col-sm-3 col-md-3">
<ul class="footer_links">
<li><a href="https://www.docker.com/what-docker">What is Docker</a></li>
<li><a href="https://www.docker.com/what-container">What is a Container</a></li>
Expand All @@ -32,7 +32,7 @@
<li><a href="https://www.docker.com/careers">Careers</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<div class="col-xs-12 col-sm-3 col-md-3">
<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>
Expand All @@ -44,22 +44,6 @@
</ul>
</div>
<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 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 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 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&#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>
<li><a href="https://www.docker.com//docker-ubuntu">Docker for Ubuntu</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<ul class="footer_links">
<li><a href="https://docs.docker.com/">Documentation</a></li>
<li><a href="https://www.docker.com/docker">Learn</a></li>
Expand All @@ -70,7 +54,7 @@
<li><a href="https://www.docker.com/products/resources">Resources</a></li>
</ul>
</div>
<div class="col-xs-12 col-sm-3 col-md-2">
<div class="col-xs-12 col-sm-3 col-md-3">
<ul class="footer_links">
<li><a href="https://www.docker.com/docker-community">Community</a></li>
<li><a href="https://www.docker.com/technologies/overview">Open Source</a></li>
Expand All @@ -96,7 +80,7 @@
<div class="bottom_footer">
<div class="footer-copyright col-xs-12 col-md-8">
<p class="copyright">
Copyright &copy; 2017 Docker Inc. All rights reserved. </p>
Copyright &copy; 2018 Docker Inc. All rights reserved. </p>
</div>
<div class="footer_social_nav">
<ul class="nav-social">
Expand Down
5 changes: 1 addition & 4 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<nav class="nav-secondary navbar navbar-fixed-top">
<div class="fan"></div>
<!-- <div class="fan"></div> -->
<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">
<a href="/"><img class="logo" src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs"></a>
</div>
Expand Down
2 changes: 0 additions & 2 deletions _layouts/docs.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@

<!-- Go get "Open Sans" font from Google -->
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<!-- temp css will be removed -->
<link rel="stylesheet" href="/css/temp.css">
<!-- SEO stuff -->
<title>{{ page.title }} | Docker Documentation</title>
<meta property="og:title" content="{{ page.title }}" />
Expand Down
127 changes: 1 addition & 126 deletions _scss/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,129 +30,4 @@ a {
opacity: .8;
text-decoration: none;
}
}

/*
*
* images
*
*/

.content img {
display: block;
max-width: 100%;
height: auto;
}


/*
*
* global footer ***********************************************************************
*
*/

footer {
background: $white;
border-top: 1px solid #E0E4E7;
position: relative;
}

.top_footer {
padding: 50px 0 35px;
}

.footer_links {
list-style: none;
padding: 0;
li {
margin-bottom: 10px;
a {
color: #637986;
font-size: 12px;
line-height: 16px;
text-decoration: none;
}
}
}

.footer_sub_nav {
float: right;
padding: 10px 30px 20px 0;
ul {
list-style: none;
margin: 0;
padding: 0;
li {
float: left;
margin-left: 10px;
padding-bottom: 6px;
a {
color: #637986;
font-size: 12px;
}
}
}
}

.bottom_footer {
clear: both;
padding: 30px 0 20px;
border-top: 1px solid #E0E4E7;
float: left;
width: 100%;
}

.footer-copyright {
float: left;
}

.footer-copyright p {
font-family: $font;
font-size: 12px;
line-height: 17px;
color: #637986;
margin-bottom: 0;
padding: 0 0 15px;
}

.footer_social_nav {
float: right;
padding: 0 15px 0 0;
}

.footer_social_nav ul {
list-style: none;
padding: 0;
margin: 0;
}

.footer_social_nav ul li {
float: left;
position: relative;
}

.footer_social_nav ul li:before {
color: $white;
position: absolute;
top: 10px;
left: 10px;
}

.footer_social_nav ul li+li {
margin-left: 10px;
}

.footer_social_nav ul li a {
width: 32px;
height: 32px;
background-color: #82949E;
border-radius: 50px;
color: $white;
display: block;
text-indent: 9999px;
overflow: hidden;
}

.break {
margin-bottom: 20px!important;
}
}
11 changes: 11 additions & 0 deletions _scss/_content.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
*
*/

/*
*
* images
*
*/

.content img {
display: block;
max-width: 100%;
height: auto;
}
/** code formatting **/

pre {
Expand Down
Loading

0 comments on commit c02ffd6

Please sign in to comment.