Skip to content

Commit c02ffd6

Browse files
jsouthMisty Stanley-Jones
jsouth
authored and
Misty Stanley-Jones
committed
CSS fixes for version selector, removing animations, and more (docker#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
1 parent ead81f5 commit c02ffd6

13 files changed

+403
-454
lines changed

Diff for: ‎_includes/footer.html

+4-20
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<div class="container">
1919
<div class="top_footer">
2020
<div class="row">
21-
<div class="col-xs-12 col-sm-3 col-md-2">
21+
<div class="col-xs-12 col-sm-3 col-md-3">
2222
<ul class="footer_links">
2323
<li><a href="https://www.docker.com/what-docker">What is Docker</a></li>
2424
<li><a href="https://www.docker.com/what-container">What is a Container</a></li>
@@ -32,7 +32,7 @@
3232
<li><a href="https://www.docker.com/careers">Careers</a></li>
3333
</ul>
3434
</div>
35-
<div class="col-xs-12 col-sm-3 col-md-2">
35+
<div class="col-xs-12 col-sm-3 col-md-3">
3636
<ul class="footer_links">
3737
<li><a href="https://www.docker.com/products/overview">Product</a></li>
3838
<li><a href="https://www.docker.com/pricing">Pricing</a></li>
@@ -44,22 +44,6 @@
4444
</ul>
4545
</div>
4646
<div class="col-xs-12 col-sm-3 col-md-3">
47-
<ul class="footer_links">
48-
<li><a href="https://www.docker.com/docker-mac">Docker for Mac</a></li>
49-
<li class="break"><a href="https://www.docker.com/docker-windows">Docker for Windows (PC)</a></li>
50-
<li><a href="https://www.docker.com/docker-aws" class="web30">Docker for AWS</a></li>
51-
<li class="break"><a href="https://www.docker.com/docker-microsoft-azure">Docker for Azure</a></li>
52-
<li><a href="https://www.docker.com/docker-windows-server">Docker for Windows Server</a></li>
53-
<li><a href="https://www.docker.com/docker-centos">Docker for CentOS distribution</a></li>
54-
<li><a href="https://www.docker.com/docker-debian">Docker for Debian</a></li>
55-
<li><a href="https://www.docker.com/docker-fedora">Docker for Fedora&#x00AE</a></li>
56-
<li><a href="https://www.docker.com/docker-oracle-linux">Docker for Oracle Enterprise Linux</a></li>
57-
<li><a href="https://www.docker.com/docker-rhel">Docker for RHEL</a></li>
58-
<li><a href="https://www.docker.com/docker-sles">Docker for SLES</a></li>
59-
<li><a href="https://www.docker.com//docker-ubuntu">Docker for Ubuntu</a></li>
60-
</ul>
61-
</div>
62-
<div class="col-xs-12 col-sm-3 col-md-2">
6347
<ul class="footer_links">
6448
<li><a href="https://docs.docker.com/">Documentation</a></li>
6549
<li><a href="https://www.docker.com/docker">Learn</a></li>
@@ -70,7 +54,7 @@
7054
<li><a href="https://www.docker.com/products/resources">Resources</a></li>
7155
</ul>
7256
</div>
73-
<div class="col-xs-12 col-sm-3 col-md-2">
57+
<div class="col-xs-12 col-sm-3 col-md-3">
7458
<ul class="footer_links">
7559
<li><a href="https://www.docker.com/docker-community">Community</a></li>
7660
<li><a href="https://www.docker.com/technologies/overview">Open Source</a></li>
@@ -96,7 +80,7 @@
9680
<div class="bottom_footer">
9781
<div class="footer-copyright col-xs-12 col-md-8">
9882
<p class="copyright">
99-
Copyright &copy; 2017 Docker Inc. All rights reserved. </p>
83+
Copyright &copy; 2018 Docker Inc. All rights reserved. </p>
10084
</div>
10185
<div class="footer_social_nav">
10286
<ul class="nav-social">

Diff for: ‎_includes/header.html

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<nav class="nav-secondary navbar navbar-fixed-top">
2-
<div class="fan"></div>
2+
<!-- <div class="fan"></div> -->
33
<div class="container-fluid">
4-
<!-- <div class="ctrl-left">
5-
<a href="javascript:void(0)" id="menu-toggle-left"><i class="fa fa-outdent" aria-hidden="true"></i></a>
6-
</div> -->
74
<div class="navbar-header">
85
<a href="/"><img class="logo" src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs"></a>
96
</div>

Diff for: ‎_layouts/docs.html

-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@
9595

9696
<!-- Go get "Open Sans" font from Google -->
9797
<link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
98-
<!-- temp css will be removed -->
99-
<link rel="stylesheet" href="/css/temp.css">
10098
<!-- SEO stuff -->
10199
<title>{{ page.title }} | Docker Documentation</title>
102100
<meta property="og:title" content="{{ page.title }}" />

Diff for: ‎_scss/_base.scss

+1-126
Original file line numberDiff line numberDiff line change
@@ -30,129 +30,4 @@ a {
3030
opacity: .8;
3131
text-decoration: none;
3232
}
33-
}
34-
35-
/*
36-
*
37-
* images
38-
*
39-
*/
40-
41-
.content img {
42-
display: block;
43-
max-width: 100%;
44-
height: auto;
45-
}
46-
47-
48-
/*
49-
*
50-
* global footer ***********************************************************************
51-
*
52-
*/
53-
54-
footer {
55-
background: $white;
56-
border-top: 1px solid #E0E4E7;
57-
position: relative;
58-
}
59-
60-
.top_footer {
61-
padding: 50px 0 35px;
62-
}
63-
64-
.footer_links {
65-
list-style: none;
66-
padding: 0;
67-
li {
68-
margin-bottom: 10px;
69-
a {
70-
color: #637986;
71-
font-size: 12px;
72-
line-height: 16px;
73-
text-decoration: none;
74-
}
75-
}
76-
}
77-
78-
.footer_sub_nav {
79-
float: right;
80-
padding: 10px 30px 20px 0;
81-
ul {
82-
list-style: none;
83-
margin: 0;
84-
padding: 0;
85-
li {
86-
float: left;
87-
margin-left: 10px;
88-
padding-bottom: 6px;
89-
a {
90-
color: #637986;
91-
font-size: 12px;
92-
}
93-
}
94-
}
95-
}
96-
97-
.bottom_footer {
98-
clear: both;
99-
padding: 30px 0 20px;
100-
border-top: 1px solid #E0E4E7;
101-
float: left;
102-
width: 100%;
103-
}
104-
105-
.footer-copyright {
106-
float: left;
107-
}
108-
109-
.footer-copyright p {
110-
font-family: $font;
111-
font-size: 12px;
112-
line-height: 17px;
113-
color: #637986;
114-
margin-bottom: 0;
115-
padding: 0 0 15px;
116-
}
117-
118-
.footer_social_nav {
119-
float: right;
120-
padding: 0 15px 0 0;
121-
}
122-
123-
.footer_social_nav ul {
124-
list-style: none;
125-
padding: 0;
126-
margin: 0;
127-
}
128-
129-
.footer_social_nav ul li {
130-
float: left;
131-
position: relative;
132-
}
133-
134-
.footer_social_nav ul li:before {
135-
color: $white;
136-
position: absolute;
137-
top: 10px;
138-
left: 10px;
139-
}
140-
141-
.footer_social_nav ul li+li {
142-
margin-left: 10px;
143-
}
144-
145-
.footer_social_nav ul li a {
146-
width: 32px;
147-
height: 32px;
148-
background-color: #82949E;
149-
border-radius: 50px;
150-
color: $white;
151-
display: block;
152-
text-indent: 9999px;
153-
overflow: hidden;
154-
}
155-
156-
.break {
157-
margin-bottom: 20px!important;
158-
}
33+
}

Diff for: ‎_scss/_content.scss

+11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,17 @@
44
*
55
*/
66

7+
/*
8+
*
9+
* images
10+
*
11+
*/
12+
13+
.content img {
14+
display: block;
15+
max-width: 100%;
16+
height: auto;
17+
}
718
/** code formatting **/
819

920
pre {

0 commit comments

Comments
 (0)