Skip to content

Commit f33b46f

Browse files
author
Jordan McCullough
committed
Merge pull request #199 from github/curriculum-dark-ship-style-tuning
Revise slide-curriculum page unification styling to usable state
2 parents 5980821 + 7fe63b7 commit f33b46f

File tree

2 files changed

+47
-58
lines changed

2 files changed

+47
-58
lines changed

_stylesheets/curriculum-beta.css

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -62,26 +62,38 @@ html, body {
6262
/* GitHub Links */
6363
/* GitHub Book Links, Guide Links */
6464
/* YouTube Links */ }
65-
.curriculum h1, .curriculum h2, .curriculum h3, .curriculum h4, .curriculum h5, .curriculum h6, .curriculum p, .curriculum ul, .curriculum pre, .curriculum svg {
65+
.curriculum h1, .curriculum h2, .curriculum h3, .curriculum h4, .curriculum h5, .curriculum h6, .curriculum p, .curriculum ul, .curriculum svg {
6666
font-weight: normal;
67-
padding: 0 30%; }
67+
margin: 0 15%; }
68+
.curriculum pre {
69+
margin: 0 15%;
70+
background: white; }
71+
.curriculum pre:before {
72+
content: "\f0c8";
73+
font: normal normal 22px octicons;
74+
float: right;
75+
opacity: .4; }
6876
.curriculum h3 {
6977
font-size: 400%;
7078
line-height: 1.25em;
71-
margin-bottom: .5em; }
79+
margin-bottom: .5em;
80+
text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
7281
.curriculum h4 {
7382
font-size: 250%;
74-
margin-bottom: .5em; }
83+
line-height: 1.35em;
84+
margin-bottom: .5em;
85+
text-shadow: 0 1px rgba(0, 0, 0, 0.1);
86+
color: #454545;
87+
border-bottom: solid 1px #e8e8ea; }
7588
.curriculum p {
7689
line-height: 1.75em;
77-
margin: 2em 0; }
90+
margin-bottom: 2em; }
7891
.curriculum ul {
7992
display: inline-block;
8093
text-align: left; }
81-
.curriculum .diagram {
82-
width: 60%;
83-
/*margin: 0 auto;*/
84-
text-align: center; }
94+
.curriculum iframe {
95+
display: block;
96+
margin: 0 auto; }
8597
.curriculum .slide {
8698
min-height: 100%;
8799
width: 100%;
@@ -138,19 +150,6 @@ html, body {
138150
color: #CCCCCC;
139151
content: "\f078";
140152
font: normal normal 20px octicons; }
141-
.curriculum pre {
142-
padding: 10px auto;
143-
margin: 1em auto 2em;
144-
width: auto;
145-
/* To ensure scrolling of long code lines */
146-
overflow: auto;
147-
word-wrap: normal;
148-
white-space: pre; }
149-
.curriculum pre:before {
150-
content: "\f0c8";
151-
font: normal normal 22px octicons;
152-
float: right;
153-
opacity: .4; }
154153

155154
#toc-wrapper {
156155
position: fixed;

_stylesheets/curriculum-beta.scss

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
@import "octicons.css";
44
@import "footer.scss";
55

6+
$mono-dark: #454545;
67
@mixin octicon-link($char){
78
font: normal normal 1em octicons;
89
text-decoration: none;
@@ -28,36 +29,54 @@ html, body{
2829
height: 100%;
2930
width: 100%;
3031

31-
h1,h2,h3,h4,h5,h6,p,ul,pre,svg{
32+
h1,h2,h3,h4,h5,h6,p,ul,svg{
3233
font-weight: normal;
33-
padding: 0 30%;
34+
margin: 0 15%;
35+
}
36+
37+
pre{
38+
margin: 0 15%;
39+
background: $mono-bright;
40+
41+
&:before {
42+
content: "\f0c8";
43+
font: normal normal 22px octicons;
44+
float: right;
45+
opacity: .4;
46+
}
3447
}
3548

3649
h3{
3750
font-size: 400%;
3851
line-height: 1.25em;
3952
margin-bottom: .5em;
53+
text-shadow: 0 1px rgba(0,0,0,.1);
4054
}
4155

4256
h4{
4357
font-size: 250%;
58+
line-height: 1.35em;
4459
margin-bottom: .5em;
60+
text-shadow: 0 1px rgba(0,0,0,.1);
61+
color: $mono-dark;
62+
border-bottom: solid 1px $mono-light;
4563
}
4664

4765
p{
4866
line-height: 1.75em;
49-
margin: 2em 0;
67+
margin-bottom: 2em;
5068
}
5169
ul{
5270
display: inline-block;
5371
text-align: left;
5472
}
55-
.diagram{
56-
width: 60%;
57-
/*margin: 0 auto;*/
58-
text-align: center;
73+
74+
iframe{
75+
display: block;
76+
margin: 0 auto;
5977
}
6078

79+
6180
.slide{
6281
min-height: 100%;
6382
width: 100%;
@@ -114,35 +133,6 @@ html, body{
114133
font: normal normal 20px octicons;
115134
}
116135
}
117-
//
118-
// pre{
119-
// margin: 0 30%;
120-
// }
121-
122-
// table, pre{
123-
// background: $mono-light;
124-
// padding: 20px;
125-
// display: block;
126-
// }
127-
128-
pre{
129-
padding: 10px auto;
130-
margin: 1em auto 2em;
131-
width: auto;
132-
133-
/* To ensure scrolling of long code lines */
134-
overflow: auto;
135-
word-wrap: normal;
136-
white-space: pre;
137-
}
138-
139-
pre:before {
140-
content: "\f0c8";
141-
font: normal normal 22px octicons;
142-
float: right;
143-
opacity: .4;
144-
}
145-
146136
}
147137

148138
#toc-wrapper{

0 commit comments

Comments
 (0)