Skip to content

Commit 98bec4a

Browse files
author
Jordan McCullough
committed
Merge pull request #209 from github/curriculum-go-live-home-links
Update home page with new curriculum slide/workbook combination
2 parents 01c0513 + 2686a35 commit 98bec4a

File tree

16 files changed

+952
-2016
lines changed

16 files changed

+952
-2016
lines changed

‎_layouts/curriculum-beta.html

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎_layouts/curriculum.html

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,51 @@
11
---
2-
layout: bare
32
leadingpath: ../
43
---
54

6-
<script src="{{ page.leadingpath }}_javascript/snap-svg/dist/snap.svg-min.js"></script>
7-
<script src="{{ page.leadingpath }}_javascript/curriculum.js"></script>
85

9-
<section class="hero overview">
10-
<div class="container">
11-
<div class="content">
12-
<h2>{{ page.title }}</h2>
13-
<p>{{ page.description }}</p>
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+
<!--Scrollsnap-->
17+
<script src="{{ page.leadingpath }}_javascript/jquery-scrollsnap-plugin/src/jquery.scrollstop.js"></script>
18+
<script src="{{ page.leadingpath }}_javascript/jquery-scrollsnap-plugin/src/jquery.easing.min.js"></script>
19+
<script src="{{ page.leadingpath }}_javascript/jquery-scrollsnap-plugin/src/jquery.scrollsnap.js"></script>
20+
21+
<!--Curriculum setup JS-->
22+
<script src="{{ page.leadingpath }}_javascript/curriculum.js"></script>
23+
24+
<!--Curriculum special styling-->
25+
<link rel="stylesheet" href="{{ page.leadingpath }}_stylesheets/curriculum-beta.css" type="text/css" />
26+
</head>
27+
<body data-spy="scroll" data-target="#toc">
28+
{% include navigation.html %}
29+
30+
<div class="hero overview">
31+
<div class="container">
32+
<div class="content">
33+
<h2>{{ page.title }}</h2>
34+
<p>{{ page.description }}</p>
35+
</div>
36+
</div>
1437
</div>
15-
</div>
16-
</section>
17-
18-
<div class="container curriculum">
19-
<div class="two-thirds markdown-content">
20-
{{ content }}
21-
</div>
22-
23-
<div class="third">
24-
<div id="toc-wrapper">
25-
<div id="toc" data-spy="affix" data-offset-top="165">
26-
<ul id="toc-list" class="nav" role="tablist"></ul>
38+
39+
<div class="curriculum">
40+
<div id="toc-wrapper">
41+
<div id="toc" data-spy="affix" data-offset-top="165">
42+
<ul id="toc-list" class="nav" role="tablist"></ul>
43+
</div>
2744
</div>
45+
46+
{{ content }}
2847
</div>
29-
</div>
30-
</div>
3148

32-
{% include footer.html %}
49+
{% include footer.html %}
50+
</body>
51+
</html>

‎_stylesheets/core.scss

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,6 @@
1111
}
1212
}
1313

14-
.invert{
15-
background: $mono-dark;
16-
border-bottom: solid 1px $mono-light;
17-
color: $mono-bright;
18-
h2{
19-
color: darken($mono-light, 20%);
20-
}
21-
h3,p{
22-
color: darken($mono-bright, 0%);
23-
}
24-
25-
a{
26-
color: darken($mono-light, 10%);
27-
28-
&:hover{
29-
color: $mono-bright;
30-
}
31-
}
32-
}
33-
34-
.grey{
35-
background: lighten($mono-light, 5%);
36-
border-top: solid 1px $mono-light;
37-
border-bottom: solid 1px $mono-light;
38-
}
39-
4014
.button{
4115
display: inline;
4216
border-radius: 3px;

‎_stylesheets/curriculum.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122

123123
#toc-wrapper{
124124
float: right;
125-
padding: 15px 0 0 0;
125+
padding: 0;
126126
}
127127

128128
#toc{

‎_stylesheets/hero.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
background: #1875c6;
55
color: #fff;
66
font-size: 1.4em;
7+
margin-bottom: 1em;
78
}
89

910
.hero h2 {

‎_stylesheets/home.scss

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,5 @@
1-
/* Imports */
2-
@import "variables.scss";
3-
4-
.figures{
5-
background: url(../images/hero-home.png) no-repeat bottom center $color-dark;
6-
background-size: 1350px;
7-
}
8-
9-
.screen-shot{
10-
background: url(../images/screen-shot-slidedeck.png) no-repeat bottom center;
11-
background-size: contain;
12-
padding-bottom: 300px;
13-
}
14-
15-
.workbook{
16-
background: url(../images/screen-shot-workbook.png) no-repeat 0px 25px lighten($mono-light, 5%);
17-
background-size: contain;
18-
padding-bottom: 270px;
19-
}
20-
211
.downloads{
22-
background: url(../images/screen-shot-pdf.png) no-repeat bottom right;
2+
background: url(../images/screen-shot-pdf.png) no-repeat bottom center;
233
background-size: contain;
244
padding-bottom: 300px;
255
}

0 commit comments

Comments
 (0)