Skip to content

Commit b9062e6

Browse files
ShMcKShMcK
committed
learn, build
1 parent 25fd84f commit b9062e6

File tree

3 files changed

+126
-119
lines changed

3 files changed

+126
-119
lines changed

‎_includes/footer.html

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,42 @@
11
<!-- Footer -->
22
<footer>
3-
<div class="container">
4-
<div class="row">
5-
<div class="col-md-8">
6-
<ul class="list-inline">
7-
<li>
8-
<a href="#home">Home</a>
9-
</li>
10-
<li class="footer-menu-divider">&sdot;</li>
11-
<li>
12-
<a href="#about">About</a>
13-
</li>
14-
<li class="footer-menu-divider">&sdot;</li>
15-
<li>
16-
<a href="#services">Services</a>
17-
</li>
18-
<li class="footer-menu-divider">&sdot;</li>
19-
<li>
20-
<a href="#contact">Contact</a>
21-
</li>
22-
</ul>
23-
<p class="copyright text-muted small">
24-
Copyright &copy; 2016 Shawn McKay (<a href="https://twitter.com/sh_mck" target="_blank">@Sh_McK</a>), Vancouver, BC. All Rights Reserved.
25-
</p>
26-
</div>
27-
<div class="col-md-4">
28-
<!-- promotion -->
29-
<!-- <ul class="promotion">
3+
<div class="container">
4+
<div class="row">
5+
<div class="col-md-8">
6+
<ul class="list-inline">
7+
<li>
8+
<a href="#home">Home</a>
9+
</li>
10+
<li class="footer-menu-divider">&sdot;</li>
11+
<li>
12+
<a href="#about">About</a>
13+
</li>
14+
<li class="footer-menu-divider">&sdot;</li>
15+
<li>
16+
<a href="#learn">Learn</a>
17+
</li>
18+
<li class="footer-menu-divider">&sdot;</li>
19+
<li>
20+
<a href="#build">Build</a>
21+
</li>
22+
<li class="footer-menu-divider">&sdot;</li>
23+
<li>
24+
<a href="#contact">Contact</a>
25+
</li>
26+
</ul>
27+
<p class="copyright text-muted small">
28+
Copyright &copy; 2016 Shawn McKay (<a href="https://twitter.com/sh_mck" target="_blank">@Sh_McK</a>), Vancouver, BC. All Rights Reserved.
29+
</p>
30+
</div>
31+
<div class="col-md-4">
32+
<!-- promotion -->
33+
<!-- <ul class="promotion">
3034
<li><a href="https://news.ycombinator.com/submit" class="hn-button" data-title="CodeRoad: Free Open-Sourced Interactive Coding Tutorials" data-url="https://coderoad.github.io" data-count="horizontal" data-style="twitter">Vote on Hacker News</a></li>
3135
<li><a class="twitter-hashtag-button" href="https://twitter.com/intent/tweet?button_hashtag=CodeRoad">
3236
Tweet #CodeRoad</a></li>
3337
</ul> -->
34-
<!-- end promotion -->
35-
</div>
36-
</div>
38+
<!-- end promotion -->
39+
</div>
3740
</div>
41+
</div>
3842
</footer>

‎_includes/header.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
<a class="page-scroll" href="#about">About</a>
1919
</li>
2020
<li>
21-
<a class="page-scroll" href="#services">Services</a>
21+
<a class="page-scroll" href="#learn">Learn</a>
22+
</li>
23+
<li>
24+
<a class="page-scroll" href="#build">Build</a>
2225
</li>
2326
<li>
2427
<a class="page-scroll" href="#contact">Contact</a>

‎_includes/page_content.html

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<section id="services">
1+
<section id="learn">
22
<!-- Page Content -->
33

44
<div class="content-section-b">
@@ -58,8 +58,8 @@ <h2 class="section-heading">Inside of the Editor</h2>
5858
</div>
5959
<div class="col-lg-5 col-lg-offset-2 col-sm-6">
6060
<a href="https://atom.io" target="_blank">
61-
<img height="250px" src="img/services/atom-editor.png" alt="atom editor">
62-
</a>
61+
<img height="250px" src="img/services/atom-editor.png" alt="atom editor">
62+
</a>
6363
</div>
6464
</div>
6565

@@ -68,37 +68,38 @@ <h2 class="section-heading">Inside of the Editor</h2>
6868

6969
</div>
7070
<!-- /.content-section-a -->
71+
</div>
7172

72-
<div class="content-section-a">
73+
<div id="build">
74+
<div class="content-section-a">
7375

74-
<div class="container">
76+
<div class="container">
7577

76-
<div class="row">
77-
<div class="col-lg-4 col-lg-offset-2 col-sm-push-6 col-sm-6">
78-
<!-- <hr class="section-heading-spacer"> -->
79-
<div class="clearfix"></div>
80-
<h2 class="section-heading">Build in Markdown</h2>
81-
<div class="lead">Write lessons using markdown. <br>
82-
See a <a href="https://github.com/coderoad/coderoad-functional-school/blob/master/tutorial/1/01/filter.md" target="_blank">tutorial file</a>.
83-
<br>
84-
<br>
85-
Control the editor with a simple API:
86-
<br>
87-
<br>
88-
<br>
89-
<ul>
90-
<li><code>@import</code> load another markdown file</li>
91-
<br>
92-
<li><code>@test</code> load unit tests</li>
93-
<br>
94-
<li><code>@action</code> open a file, set/insert text</li>
95-
<br>
96-
<li><code>@hint</code> add helpful clues</li>
97-
</ul>
78+
<div class="row">
79+
<div class="col-lg-4 col-lg-offset-2 col-sm-push-6 col-sm-6">
80+
<!-- <hr class="section-heading-spacer"> -->
81+
<div class="clearfix"></div>
82+
<h2 class="section-heading">Build in Markdown</h2>
83+
<div class="lead">Write lessons using markdown.
84+
<br> See a <a href="https://github.com/coderoad/coderoad-functional-school/blob/master/tutorial/1/01/filter.md" target="_blank">tutorial file</a>.
85+
<br>
86+
<br> Control the editor with a simple API:
87+
<br>
88+
<br>
89+
<br>
90+
<ul>
91+
<li><code>@import</code> load another markdown file</li>
92+
<br>
93+
<li><code>@test</code> load unit tests</li>
94+
<br>
95+
<li><code>@action</code> open a file, set/insert text</li>
96+
<br>
97+
<li><code>@hint</code> add helpful clues</li>
98+
</ul>
99+
</div>
98100
</div>
99-
</div>
100-
<div class="col-lg-6 col-sm-pull-6 col-sm-6">
101-
<pre><code class="language-markdown">
101+
<div class="col-lg-6 col-sm-pull-6 col-sm-6">
102+
<pre><code class="language-markdown">
102103
# Functional School
103104
A trip through functional programming in Javascript.
104105

@@ -121,42 +122,41 @@ <h2 class="section-heading">Build in Markdown</h2>
121122
```
122123
))
123124
</pre></code>
125+
</div>
124126
</div>
127+
125128
</div>
129+
<!-- /.container -->
126130

127131
</div>
128-
<!-- /.container -->
132+
<!-- /.content-section-b -->
129133

130-
</div>
131-
<!-- /.content-section-b -->
134+
<div class="content-section-b">
132135

133-
<div class="content-section-b">
136+
<div class="container">
134137

135-
<div class="container">
136-
137-
<div class="row">
138-
<div class="col-lg-4 col-sm-6">
139-
<!-- <hr class="section-heading-spacer"> -->
140-
<div class="clearfix"></div>
141-
<h2 class="section-heading">Unit Test Feedback</h2>
142-
<div class="lead"> Write task feedback using unit tests.<br>
143-
See a <a href="https://github.com/coderoad/coderoad-functional-school/blob/master/tutorial/1/01/01-filter.spec.js" target="_blank">complete test file</a>.
144-
<br>
145-
<br>
146-
<br>
147-
Currently supported:
148-
<br>
149-
<br>
150-
<ul>
151-
<li>Javascript: <a href="https://github.com/coderoad/mocha-coderoad" target="_blank">Mocha</a></li>
152-
</ul>
153-
<br>
154-
<br>
155-
<br>
156-
<i>We hope to support more test frameworks and programming languages in the near future.</i></div>
157-
</div>
158-
<div class="col-lg-6 col-lg-offset-2 col-sm-6">
159-
<pre><code class="language-js">
138+
<div class="row">
139+
<div class="col-lg-4 col-sm-6">
140+
<!-- <hr class="section-heading-spacer"> -->
141+
<div class="clearfix"></div>
142+
<h2 class="section-heading">Unit Test Feedback</h2>
143+
<div class="lead"> Write task feedback using unit tests.
144+
<br> See a <a href="https://github.com/coderoad/coderoad-functional-school/blob/master/tutorial/1/01/01-filter.spec.js" target="_blank">complete test file</a>.
145+
<br>
146+
<br>
147+
<br> Currently supported:
148+
<br>
149+
<br>
150+
<ul>
151+
<li>Javascript: <a href="https://github.com/coderoad/mocha-coderoad" target="_blank">Mocha</a></li>
152+
</ul>
153+
<br>
154+
<br>
155+
<br>
156+
<i>We hope to support more test frameworks and programming languages in the near future.</i></div>
157+
</div>
158+
<div class="col-lg-6 col-lg-offset-2 col-sm-6">
159+
<pre><code class="language-js">
160160
describe('01 function isAda', function () {
161161

162162
it('doesn\'t exist', function () {
@@ -178,48 +178,48 @@ <h2 class="section-heading">Unit Test Feedback</h2>
178178

179179
});
180180
</code></pre>
181+
</div>
181182
</div>
183+
182184
</div>
185+
<!-- /.container -->
183186

184187
</div>
185-
<!-- /.container -->
186-
187-
</div>
188-
<!-- /.content-section-a -->
188+
<!-- /.content-section-a -->
189189

190-
<div class="content-section-a">
190+
<div class="content-section-a">
191191

192-
<div class="container">
192+
<div class="container">
193193

194-
<div class="row">
195-
<div class="col-lg-5 col-lg-offset-1 col-sm-push-6 col-sm-6">
196-
<!-- <hr class="section-heading-spacer"> -->
197-
<div class="clearfix"></div>
198-
<h2 class="section-heading">Compile with Coderoad-CLI</h2>
199-
<div class="lead">Building tutorials is easy with the <a href="https://github.com/coderoad/coderoad-cli" target="_blank">coderoad-cli</a>.
194+
<div class="row">
195+
<div class="col-lg-5 col-lg-offset-1 col-sm-push-6 col-sm-6">
196+
<!-- <hr class="section-heading-spacer"> -->
197+
<div class="clearfix"></div>
198+
<h2 class="section-heading">Compile with Coderoad-CLI</h2>
199+
<div class="lead">Building tutorials is easy with the <a href="https://github.com/coderoad/coderoad-cli" target="_blank">coderoad-cli</a>.
200+
</div>
200201
</div>
201-
</div>
202-
<div class="col-lg-5 col-sm-pull-6 col-sm-6">
203-
<div class="lead">
204-
<code>> npm install -g coderoad-cli</code>
205-
<br>
206-
<br>
207-
<code>> coderoad create</code>
208-
<br>
209-
<br>
210-
<code>> coderoad build</code>
211-
<br>
212-
<br>
213-
<code>> coderoad publish</code>
202+
<div class="col-lg-5 col-sm-pull-6 col-sm-6">
203+
<div class="lead">
204+
<code>> npm install -g coderoad-cli</code>
205+
<br>
206+
<br>
207+
<code>> coderoad create</code>
208+
<br>
209+
<br>
210+
<code>> coderoad build</code>
211+
<br>
212+
<br>
213+
<code>> coderoad publish</code>
214+
</div>
214215
</div>
215216
</div>
217+
216218
</div>
219+
<!-- /.container -->
217220

218221
</div>
219-
<!-- /.container -->
220-
221-
</div>
222-
<!-- /.content-section-b -->
222+
<!-- /.content-section-b -->
223223

224224

225225

0 commit comments

Comments
 (0)