Skip to content

Commit 03d6c94

Browse files
author
jordanmccullough
committed
Fix import order dependency
1 parent 6a139d6 commit 03d6c94

File tree

2 files changed

+131
-70
lines changed

2 files changed

+131
-70
lines changed

_stylesheets/default.css

Lines changed: 130 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import url(octicons.css);
22
/* Imports */
3+
/* Color Definitions */
34
/* Reset */
45
html, body, div, span, applet, object, iframe,
56
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
@@ -29,11 +30,11 @@ footer, header, hgroup, menu, nav, section {
2930
body {
3031
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
3132
font-size: 16px;
32-
background: #fff; }
33+
background: #fff;
34+
color: #222222; }
3335

34-
/* Color Definitions */
3536
a {
36-
color: #00a5ea;
37+
color: #1875c6;
3738
text-decoration: none;
3839
-webkit-transition: color 200ms;
3940
transition: color border 200ms; }
@@ -51,72 +52,42 @@ a {
5152
font-size: 120%; }
5253

5354
h1 {
54-
font-size: 46px;
55+
font-size: 350%;
5556
font-weight: 200;
5657
text-rendering: optimizeLegibility; }
5758

5859
h2 {
59-
font-size: 200%;
60-
line-height: 150%;
61-
color: #222; }
60+
font-size: 250%;
61+
font-weight: 200;
62+
margin: 20px 0 0 0;
63+
color: #3c3c3c; }
6264

6365
h2 + p {
64-
font-size: 125%;
66+
font-size: 115%;
6567
font-weight: 200;
6668
text-rendering: optimizeLegibility;
6769
line-height: 150%;
68-
opacity: .65;
69-
margin: auto auto 20px auto; }
70+
color: #6f6f6f;
71+
margin: 10px auto 20px; }
7072

7173
h3 {
7274
font-size: 125%;
73-
margin: 20px 0 0 0;
74-
color: #222; }
75+
margin: 0; }
7576

7677
p {
7778
text-rendering: optimizeLegibility;
7879
line-height: 150%; }
7980

80-
header {
81-
background: #fff;
82-
color: #ddd;
83-
padding: 15px; }
84-
header a {
85-
color: #d9d9d9; }
86-
header a:hover {
87-
color: #d9d9d9; }
88-
header a:hover .logo {
89-
margin-top: -32px;
90-
opacity: 0; }
91-
header nav {
92-
float: right;
93-
font-size: 14px;
94-
line-height: 26px; }
95-
header nav ul li {
96-
display: inline-block;
97-
margin-left: 10px; }
98-
header nav .button {
99-
padding: 8px;
100-
border: solid 1px #eee;
101-
border-radius: 5px; }
102-
header .octicon {
103-
font-size: 26px; }
104-
header .logo-training-materials {
105-
display: inline-block;
106-
height: 20px;
107-
width: 178px; }
108-
header .logo-training-materials:before {
109-
content: "";
110-
background: url(../images/training-materials-dark-2x.png) no-repeat top left;
111-
background-size: contain;
112-
height: 24px;
113-
width: 178px;
114-
display: block;
115-
opacity: .15; }
81+
.button {
82+
padding: 8px;
83+
border: solid 1px #e8e8ea;
84+
border-radius: 5px; }
11685

11786
section {
11887
width: 100%;
11988
float: left; }
89+
section .container {
90+
padding: 20px 0; }
12091

12192
code {
12293
font-family: "Courier New", Courier, monospace;
@@ -125,13 +96,9 @@ code {
12596

12697
pre {
12798
width: 100%;
128-
background: #222;
129-
line-height: 140%;
130-
margin: 30px 0;
131-
border-radius: 3px; }
132-
pre code {
133-
display: block;
134-
padding: 10px; }
99+
background: rgba(0, 0, 0, 0.04);
100+
border-radius: 3px;
101+
padding: 0 10px; }
135102

136103
table {
137104
width: 100%;
@@ -152,35 +119,128 @@ table {
152119
ul {
153120
margin: 0 0 0 1.5em; }
154121

122+
nav hgroup {
123+
float: left; }
124+
nav .logo-training-materials {
125+
display: inline-block;
126+
height: 26px;
127+
width: 237px; }
128+
nav .logo-training-materials:before {
129+
content: "";
130+
background: url(../images/training-materials-dark-2x.png) no-repeat top left;
131+
background-size: contain;
132+
height: 32px;
133+
width: 237px;
134+
display: block; }
135+
nav ul {
136+
float: right;
137+
margin: 0;
138+
padding: 0;
139+
height: 26px;
140+
font-size: 14px;
141+
line-height: 26px; }
142+
nav ul li {
143+
display: inline-block;
144+
margin-left: 16px; }
145+
nav ul a {
146+
color: inherit;
147+
font-weight: 500; }
148+
nav ul a:hover {
149+
color: white;
150+
border-bottom: solid 2px white; }
151+
nav ul a.button:hover {
152+
border: solid 1px #00a5ea; }
153+
155154
.container {
156-
width: 830px;
157-
margin: 40px auto auto;
155+
width: 930px;
156+
margin: 0 auto auto;
158157
position: relative; }
159158
header .container {
160159
margin: 0 auto; }
161160

162161
.center {
163162
text-align: center; }
164163

165-
.logo-group {
166-
height: 25px;
167-
overflow: hidden; }
168-
.logo-group .description {
169-
line-height: 32px; }
170-
171-
.logo {
172-
-webkit-transition: margin 600ms, opacity 300ms;
173-
transition: margin 600ms, opacity 300ms; }
174-
175164
.license {
176165
color: #00a5ea;
177166
font-size: 12px; }
178167
.license a {
179-
color: #00a5ea; }
168+
color: #59a7eb; }
180169
.license .container {
181170
margin: 0 auto;
182171
padding: 5px; }
183172

173+
.tab-panel {
174+
background: #fff;
175+
position: block;
176+
margin: 30px auto 0 auto;
177+
height: 3em;
178+
width: 360px;
179+
position: relative; }
180+
.tab-panel label {
181+
background: #f5f5f5;
182+
-webkit-transition: background 250ms ease-in-out; }
183+
.tab-panel label:hover {
184+
background: #fff; }
185+
.tab-panel .column-2up {
186+
width: 50%; }
187+
.tab-panel .column-3up {
188+
width: 33%; }
189+
.tab-panel .column-4up {
190+
width: 25%; }
191+
.tab-panel .tab {
192+
float: left;
193+
box-shadow: 0 0 0 1px #dfdfdf; }
194+
.tab-panel .tab.first {
195+
border-top-left-radius: 5px;
196+
border-bottom-left-radius: 5px;
197+
border-right: none; }
198+
.tab-panel .tab.last {
199+
border-top-right-radius: 5px;
200+
border-bottom-right-radius: 5px;
201+
border-left: none; }
202+
.tab-panel .tab > span {
203+
display: block;
204+
text-align: center;
205+
margin: 10px;
206+
font-size: 80%; }
207+
.tab-panel .panel-content {
208+
width: 200%;
209+
visibility: hidden;
210+
position: absolute;
211+
left: -50%;
212+
-webkit-transition: opacity 400ms;
213+
transition: opacity 400ms; }
214+
.tab-panel .panel-content .octicon-hero {
215+
display: inline-block;
216+
padding: 0 10px;
217+
color: #ddd; }
218+
.tab-panel .panel-content p {
219+
font-size: 80%;
220+
text-align: center;
221+
margin: 20px 0;
222+
font-weight: 200; }
223+
.tab-panel .panel-content ul {
224+
text-align: center; }
225+
.tab-panel .panel-content li {
226+
display: inline-block; }
227+
.tab-panel input.material-type {
228+
position: absolute;
229+
left: -999px; }
230+
.tab-panel input.material-type:checked + label {
231+
background: #00a5ea; }
232+
.tab-panel input.material-type:checked + label > span {
233+
color: #fff;
234+
opacity: 1; }
235+
.tab-panel input.material-type:checked + label.tab > div.panel-content {
236+
visibility: visible; }
237+
238+
.colorful {
239+
background: #1875c6;
240+
color: white; }
241+
.colorful a {
242+
color: white; }
243+
184244
footer {
185245
float: left;
186246
position: relative;
@@ -189,7 +249,8 @@ footer {
189249
color: #777;
190250
clear: both;
191251
width: 100%;
192-
margin: 40px auto 40px auto;
252+
margin: 0 auto 0 auto;
253+
padding: 20px 0 20px 0;
193254
border-top: 1px solid #eee; }
194255
footer .right {
195256
float: right;

_stylesheets/default.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* Imports */
2-
@import "reset.scss";
32
@import "variables.scss";
3+
@import "reset.scss";
44
@import "links.scss";
55
@import "core.scss";
66
@import "footer.scss";

0 commit comments

Comments
 (0)