Skip to content

Commit 59764c3

Browse files
ShMcKShMcK
committed
landing page progress
1 parent d8389f5 commit 59764c3

18 files changed

+1822
-2108
lines changed

‎_config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
# Welcome to Jekyll!
2-
#
32

43
# Site settings
54
title: CodeRoad
65
description: |
76
Interactive Coding Tutorials
87
In Your Editor
9-
owner: Shawn McKay # or company name
10-
first_published: 2016 # if migrating another site, the year of your first publish
8+
owner: Shawn McKay
9+
first_published: 2016
1110
email: [email protected]
1211
baseurl: "" # the subpath of your site, e.g. /blog
13-
url: "https://coderoad.github.com" # the base hostname & protocol for your site
12+
url: "https://coderoad.github.com"
1413
social:
1514
twitter: https://twitter.com/coderoadapp
1615
github: https://github.com/coderoad
1716
#linkedin-square: https://linkedin.com/in/<username>
1817
#facebook-official: https://facebook.com/<username>
1918
google-plus-square: https://plus.google.com/114957986906029613694/about
20-
# email: /contact/
19+
email: /contact.html
2120
#flickr:
2221
#instagram:
2322
#youtube-square:

‎_includes/footer.html

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,16 @@
11
<!-- Footer -->
22
<footer id="footer">
3-
<ul class="icons">
4-
{% for socloc in site.social %}
5-
{% if socloc[1] %}
6-
{% if socloc[0] == 'email' %}
7-
<li><a target="_blank" href="{{ socloc[1] }}" class="icon fa-envelope-o"
8-
><span class="label">E-mail</span></a></li>
9-
{% else %}
10-
<li><a target="_blank" href="{{ socloc[1] }}" class="icon fa-{{ socloc[0] }}"
11-
><span class="label">{{ socloc[0] }}</span></a></li>
12-
{% endif %}
13-
{% endif %}
14-
{% endfor %}
15-
</ul>
16-
<ul class="copyright">
17-
<li>&copy; {% assign thisyear = site.time | date: "%Y" %}
18-
{% if site.first_published %}
19-
{% capture diff %}{{ site.first_published | minus:thisyear }}{% endcapture %}
20-
{% if diff contains '-' %}{{ site.first_published }},{% endif %}
21-
{% endif %}
22-
{{ thisyear }}
23-
{% if site.owner %}{{ site.owner }}{% else %}{{ site.title }}{% endif %}</li>
24-
<!-- <li>Design: <a href="http://html5up.net" target="_blank">HTML5 UP</a></li>
3+
<ul class="icons">
4+
{% for socloc in site.social %} {% if socloc[1] %} {% if socloc[0] == 'email' %}
5+
<li><a target="_blank" href="{{ socloc[1] }}" class="icon fa-envelope-o"><span class="label">E-mail</span></a></li>
6+
{% else %}
7+
<li><a target="_blank" href="{{ socloc[1] }}" class="icon fa-{{ socloc[0] }}"><span class="label">{{ socloc[0] }}</span></a></li>
8+
{% endif %} {% endif %} {% endfor %}
9+
</ul>
10+
<ul class="copyright">
11+
<li>&copy; {% assign thisyear = site.time | date: "%Y" %} {% if site.first_published %} {% capture diff %}{{ site.first_published | minus:thisyear }}{% endcapture %} {% if diff contains '-' %}{{ site.first_published }},{% endif %} {% endif %} {{ thisyear
12+
}} {% if site.owner %}{{ site.owner }}{% else %}{{ site.title }}{% endif %}</li>
13+
<!-- <li>Design: <a href="http://html5up.net" target="_blank">HTML5 UP</a></li>
2514
<li>Built with: <a href="http://jekyllrb.com" target="_blank">Jekyll</a></li> -->
26-
</ul>
15+
</ul>
2716
</footer>

‎_includes/head.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<head>
2-
<meta charset="utf-8" />
3-
<meta name="viewport" content="width=device-width, initial-scale=1" />
4-
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
5-
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
6-
<!--[if lte IE 8]><script src="{{ "/js/ie/html5shiv.js" | prepend: site.baseurl }}"></script><![endif]-->
7-
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
8-
<link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}" />
9-
<!--[if lte IE 8]><link rel="stylesheet" href="{{ "/css/ie8.css" | prepend: site.baseurl }}" /><![endif]-->
10-
<!--[if lte IE 9]><link rel="stylesheet" href="{{ "/css/ie9.css" | prepend: site.baseurl }}" /><![endif]-->
11-
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">
2+
<meta charset="utf-8" />
3+
<meta name="viewport" content="width=device-width, initial-scale=1" />
4+
<title>{% if page.title %}{{ page.title | escape }}{% else %}{{ site.title | escape }}{% endif %}</title>
5+
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
6+
<!--[if lte IE 8]><script src="{{ "/js/ie/html5shiv.js" | prepend: site.baseurl }}"></script><![endif]-->
7+
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
8+
<link rel="stylesheet" href="{{ " /css/main.css " | prepend: site.baseurl }}" />
9+
<!--[if lte IE 8]><link rel="stylesheet" href="{{ "/css/ie8.css" | prepend: site.baseurl }}" /><![endif]-->
10+
<!--[if lte IE 9]><link rel="stylesheet" href="{{ "/css/ie9.css" | prepend: site.baseurl }}" /><![endif]-->
11+
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ " /feed.xml " | prepend: site.baseurl | prepend: site.url }}">
1212
</head>

‎_includes/header.html

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<!-- Header -->
2-
<header id="header"{% if page.layout == 'landing' %} class="alt"{% endif %}>
3-
<h1><a href="{{ site.baseurl }}/index.html">{{ site.title }}</a></h1>
4-
<nav id="nav">
5-
<ul>
6-
<li class="special">
7-
<a href="#menu" class="menuToggle"><span>Menu</span></a>
8-
<div id="menu">
9-
<ul>
10-
<li><a href="index.html">Home</a></li>
11-
{% for my_page in site.pages %}
12-
{% if my_page.title %}
13-
<li><a href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></li>
14-
{% endif %}
15-
{% endfor %}
16-
</ul>
17-
</div>
18-
</li>
19-
</ul>
20-
</nav>
2+
<header id="header" {% if page.layout=='landing' %} class="alt" {% endif %}>
3+
<h1><a href="{{ site.baseurl }}/index.html">{{ site.title }}</a></h1>
4+
<nav id="nav">
5+
<ul>
6+
<li class="special">
7+
<a href="#menu" class="menuToggle"><span>Menu</span></a>
8+
<div id="menu">
9+
<ul>
10+
<li><a href="index.html">Home</a></li>
11+
{% for my_page in site.pages %} {% if my_page.title %}
12+
<li><a href="{{ my_page.url | prepend: site.baseurl }}">{{ my_page.title }}</a></li>
13+
{% endif %} {% endfor %}
14+
</ul>
15+
</div>
16+
</li>
17+
</ul>
18+
</nav>
2119
</header>

‎_includes/scripts.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<!-- Scripts -->
2-
<script src="{{ "/js/jquery.min.js" | prepend: site.baseurl }}"></script>
3-
<script src="{{ "/js/jquery.scrollex.min.js" | prepend: site.baseurl }}"></script>
4-
<script src="{{ "/js/jquery.scrolly.min.js" | prepend: site.baseurl }}"></script>
5-
<script src="{{ "/js/skel.min.js" | prepend: site.baseurl }}"></script>
6-
<script src="{{ "/js/util.js" | prepend: site.baseurl }}"></script>
2+
<script src="{{ " /js/jquery.min.js " | prepend: site.baseurl }}"></script>
3+
<script src="{{ " /js/jquery.scrollex.min.js " | prepend: site.baseurl }}"></script>
4+
<script src="{{ " /js/jquery.scrolly.min.js " | prepend: site.baseurl }}"></script>
5+
<script src="{{ " /js/skel.min.js " | prepend: site.baseurl }}"></script>
6+
<script src="{{ " /js/util.js " | prepend: site.baseurl }}"></script>
77
<!--[if lte IE 8]><script src="{{ "/js/ie/respond.min.js" | prepend: site.baseurl }}"></script><![endif]-->
8-
<script src="{{ "/js/main.js" | prepend: site.baseurl }}"></script>
9-
<script src="{{ "/js/png2gif.min.js" | prepend: site.baseurl }}"></script>
8+
<script src="{{ " /js/main.js " | prepend: site.baseurl }}"></script>
9+
<script src="{{ " /js/png2gif.min.js " | prepend: site.baseurl }}"></script>

‎_layouts/default.html

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@
77
-->
88
<html>
99

10-
{% include head.html %}
10+
{% include head.html %}
1111

12-
<body>
12+
<body>
1313

1414
<!-- Page Wrapper -->
1515
<div id="page-wrapper">
1616

17-
{% include header.html %}
18-
19-
{{ content }}
20-
21-
{% include footer.html %}
22-
23-
{% include scripts.html %}
17+
{% include header.html %} {{ content }} {% include footer.html %} {% include scripts.html %}
2418

2519
</div>
2620

27-
</body>
21+
</body>
2822

29-
</html>
23+
</html>

‎_layouts/landing.html

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@
77
-->
88
<html>
99

10-
{% include head.html %}
10+
{% include head.html %}
1111

12-
<body class="landing">
12+
<body class="landing">
1313

1414
<!-- Page Wrapper -->
1515
<div id="page-wrapper">
1616

17-
{% include header.html %}
18-
19-
{{ content }}
20-
21-
{% include footer.html %}
22-
23-
{% include scripts.html %}
17+
{% include header.html %} {{ content }} {% include footer.html %} {% include scripts.html %}
2418

2519
</div>
2620

27-
</body>
21+
</body>
2822

29-
</html>
23+
</html>

‎_layouts/page.html

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
---
22
layout: default
33
---
4+
45
<article id="main">
56

6-
<header>
7-
<h2>{{ page.title }}</h2>
8-
<p>Page title stuff here</p>
9-
</header>
7+
<header>
8+
<h2>{{ page.title }}</h2>
9+
<p>Page title stuff here</p>
10+
</header>
1011

11-
<section class="wrapper style5">
12-
<div class="inner">
13-
{{ content }}
14-
</div>
15-
</section>
12+
<section class="wrapper style5">
13+
<div class="inner">
14+
{{ content }}
15+
</div>
16+
</section>
1617

1718
</article>

‎_posts/docs/2016-01-07-test-snippets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ Test Runners may have pre-made [Atom snippets](https://atom.io/docs/latest/using
1414

1515
For example, typing the snippet `mochacr-f` will generate an entire set of tests for a *mocha-coderoad* function. See an example:
1616

17-
![Mocha Coderoad Test Snippets](/img/gif/snippets.png){: .gif}
17+
![Mocha Coderoad Test Snippets](/images/docs/snippets.png){: .gif}

0 commit comments

Comments
 (0)