Skip to content

Commit adf363e

Browse files
author
jordanmccullough
committed
Bring back original curriculum to avoid breaking current release
1 parent c22323b commit adf363e

File tree

3 files changed

+176
-66
lines changed

3 files changed

+176
-66
lines changed

‎_layouts/curriculum.html

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,31 @@
11
---
2-
2+
layout: bare
33
---
44

5+
<script src="../_javascript/snap-svg/dist/snap.svg-min.js"></script>
6+
<script src="../_javascript/curriculum.js"></script>
57

6-
<!DOCTYPE html>
7-
<html lang="{% if page.lang %}{{ page.lang }}{% else %}{{ site.lang }}{% endif %}">
8-
<head>
9-
<title>{% if page.title %}{{ page.title }} · {% endif %}{{ site.title }}</title>
10-
{% if page.description %}
11-
<meta name="description" content="{{ page.description }}" />
12-
{% endif %}
13-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
14-
15-
{% include dependencies %}
16-
8+
<section class="hero overview">
9+
<div class="container">
10+
<div class="content">
11+
<h2>{{ page.title }}</h2>
12+
<p>{{ page.description }}</p>
13+
</div>
14+
</div>
15+
</section>
1716

18-
<script src="../_javascript/snap-svg/dist/snap.svg-min.js"></script>
19-
<script src="../_javascript/curriculum.js"></script>
20-
</head>
21-
<body data-spy="scroll" data-target="#toc">
22-
{% include navigation.html %}
23-
<section class="hero overview">
24-
<div class="container">
25-
<div class="content">
26-
<h2>{{ page.title }}</h2>
27-
<p>{{ page.description }}</p>
28-
</div>
29-
</div>
30-
</section>
17+
<div class="container curriculum">
18+
<div class="two-thirds markdown-content">
19+
{{ content }}
20+
</div>
3121

22+
<div class="third">
3223
<div id="toc-wrapper">
3324
<div id="toc" data-spy="affix" data-offset-top="165">
3425
<ul id="toc-list" class="nav" role="tablist"></ul>
3526
</div>
3627
</div>
37-
38-
<div class="curriculum">
39-
<!-- <div class="two-thirds"> -->
40-
{{ content }}
41-
<!-- </div> -->
42-
</div>
43-
44-
<!-- {% include footer.html %} -->
45-
46-
47-
</body>
48-
</html>
49-
50-
51-
52-
28+
</div>
29+
</div>
5330

31+
{% include footer.html %}

‎_stylesheets/curriculum.scss

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
/* Imports */
2+
@import "variables.scss";
3+
4+
@mixin octicon-link($char){
5+
font: normal normal 1em octicons;
6+
text-decoration: none;
7+
color: $color-dark;
8+
9+
&:after{
10+
content: $char;
11+
margin-left: 5px;
12+
}
13+
}
14+
15+
.nav-list>li>a{
16+
font-size: 8pt;
17+
}
18+
19+
.curriculum{
20+
font-size: 18px;
21+
22+
h3 {
23+
margin-top: 3em;
24+
font-size: 240%;
25+
line-height: 170%;
26+
font-weight: 500;
27+
border-bottom: solid 1px #eeeeee;
28+
color: $color-dark;
29+
30+
&:first-child{
31+
margin-top: 0;
32+
}
33+
}
34+
35+
h5{
36+
font-size: 130%;
37+
margin: 2em 0 0;
38+
39+
&:before{
40+
font: normal normal 16px octicons;
41+
color: $mono-bright;
42+
content: "\f089";
43+
display: inline-block;
44+
margin-right: 1em;
45+
margin-left: -42px;
46+
border-radius: 50%;
47+
background: $mono-light;
48+
width: 30px;
49+
height: 30px;
50+
text-align: center;
51+
line-height: 30px;
52+
}
53+
}
54+
55+
p{
56+
line-height: 140%;
57+
margin-bottom: 1.8em;
58+
}
59+
60+
/* General external link */
61+
a[href^="http://"],
62+
a[href^="https://"] {
63+
@include octicon-link("\f0b6");
64+
}
65+
66+
/* GitHub Links */
67+
a[href^="https://github.com"],
68+
a[href^="https://www.github.com"],
69+
a[href^="https://help.github.com"]
70+
{
71+
@include octicon-link("\f008");
72+
}
73+
74+
/* GitHub Book Links, Guide Links */
75+
a[href^="http://git-scm.com/book"],
76+
a[href^="https://guides.github.com"]
77+
{
78+
@include octicon-link("\f007");
79+
}
80+
81+
82+
/* YouTube Links */
83+
a[href^="https://youtube.com"],
84+
a[href^="https://www.youtube.com"] {
85+
@include octicon-link("\f0b9");
86+
}
87+
88+
.summary, .outline, .details{
89+
h2:before{
90+
padding: 5px;
91+
color: #CCCCCC;
92+
content: "\f078";
93+
font: normal normal 20px octicons;
94+
}
95+
}
96+
97+
table, pre{
98+
background: $mono-light;
99+
padding: 20px;
100+
display: block;
101+
}
102+
103+
pre{
104+
padding: 10px auto;
105+
margin: 1em auto 2em;
106+
width: auto;
107+
108+
/* To ensure scrolling of long code lines */
109+
overflow: auto;
110+
word-wrap: normal;
111+
white-space: pre;
112+
}
113+
114+
pre:before {
115+
content: "\f0c8";
116+
font: normal normal 22px octicons;
117+
float: right;
118+
opacity: .4;
119+
}
120+
121+
}
122+
123+
#toc-wrapper{
124+
float: right;
125+
padding: 15px 0 0 0;
126+
}
127+
128+
#toc{
129+
width: 200px;
130+
border-radius: 3px;
131+
132+
font-size: 12px;
133+
134+
.active{
135+
font-weight: 700;
136+
137+
a{
138+
color: #222222;
139+
}
140+
}
141+
}
142+
143+
.affix-top{
144+
145+
}
146+
147+
.affix{
148+
margin-top: -165px;
149+
}
150+
151+
.affix-bottom{
152+
153+
}

‎_stylesheets/page.css

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -173,37 +173,15 @@ footer, .push {
173173
height: 154px; } }
174174
/* Imports */
175175
/* Color Definitions */
176-
html, body {
177-
height: 100%;
178-
background: #fcfcfc; }
179-
180176
.nav-list > li > a {
181177
font-size: 8pt; }
182178

183179
.curriculum {
184-
height: 100%;
185-
width: 100%;
186-
background: rgba(0, 0, 0, 0.15);
187180
font-size: 18px;
188181
/* General external link */
189182
/* GitHub Links */
190183
/* GitHub Book Links, Guide Links */
191184
/* YouTube Links */ }
192-
.curriculum .slide {
193-
min-height: 100%;
194-
background: #ffffff;
195-
display: table; }
196-
.curriculum .slide h5 {
197-
display: block;
198-
height: 0;
199-
width: 100%;
200-
background: red; }
201-
.curriculum .slide .alignment {
202-
width: 960px;
203-
display: table-cell;
204-
vertical-align: middle; }
205-
.curriculum .slide + * {
206-
background: red; }
207185
.curriculum h3 {
208186
margin-top: 3em;
209187
font-size: 240%;
@@ -294,9 +272,7 @@ html, body {
294272
opacity: .4; }
295273

296274
#toc-wrapper {
297-
position: fixed;
298-
right: 0;
299-
z-index: 10000;
275+
float: right;
300276
padding: 15px 0 0 0; }
301277

302278
#toc {
@@ -308,6 +284,9 @@ html, body {
308284
#toc .active a {
309285
color: #222222; }
310286

287+
.affix {
288+
margin-top: -165px; }
289+
311290
/* Trainers */
312291
.trainer {
313292
overflow: hidden; }

0 commit comments

Comments
 (0)