Skip to content

Commit e9a7679

Browse files
mmistakesmmistakes
committed
Merge branch 'release/1.2.0'
2 parents a253f65 + 855ca19 commit e9a7679

22 files changed

+60
-71
lines changed

‎_config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
title: Site Title
22
tagline: A short tagline
33
description: Describe your website.
4-
#Comment out url when working locally to resolve base urls correctly
5-
url: http://your-site.com
4+
# Your site's domain goes here. Leave localhost server or blank when working locally.
5+
url: http://localhost:4000
66

77
# Owner/author information
88
owner:
@@ -31,11 +31,11 @@ bing_verify:
3131
# For external links add external: true
3232
links:
3333
- title: About
34-
url: /about
34+
url: /about/
3535
- title: Articles
36-
url: /articles
36+
url: /articles/
3737
- title: Theme Setup
38-
url: /theme-setup
38+
url: /theme-setup/
3939
- title: Made Mistakes
4040
url: http://mademistakes.com
4141
external: true

‎_includes/author-bio.html renamed to ‎_includes/_author-bio.html

File renamed without changes.

‎_includes/browser-upgrade.html renamed to ‎_includes/_browser-upgrade.html

File renamed without changes.

‎_includes/footer.html renamed to ‎_includes/_footer.html

File renamed without changes.

‎_includes/head.html renamed to ‎_includes/_head.html

File renamed without changes.

‎_includes/navigation.html renamed to ‎_includes/_navigation.html

File renamed without changes.

‎_includes/scripts.html renamed to ‎_includes/_scripts.html

File renamed without changes.

‎_layouts/home.html

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@
44
<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
55
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
66
<head>
7-
{% include head.html %}
7+
{% include _head.html %}
88
</head>
99

1010
<body class="home" itemscope itemtype="http://schema.org/WebPage">
1111

12-
{% include browser-upgrade.html %}
12+
{% include _browser-upgrade.html %}
1313

14-
{% include navigation.html %}
14+
{% include _navigation.html %}
1515

1616
{% if page.image.feature %}<div class="image-wrap">
1717
<img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
1818
{% if page.image.credit %}<span class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></span>{% endif %}
1919
</div><!-- /.image-wrap -->{% endif %}
2020

21-
<div class="article-author-top">
22-
{% include author-bio.html %}
21+
<div class="article-author-side">
22+
{% include _author-bio.html %}
2323
</div>
2424

2525
<div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
26-
<h3><a href="{{ site.url}}/articles">Articles</a></h3>
27-
{% for post in site.categories.articles limit:5 %}
26+
<h3><a href="{{ site.url}}/articles/">Articles</a></h3>
27+
{% for post in site.posts limit:5 %}
2828
<article itemscope itemtype="http://schema.org/BlogPosting" itemprop="blogPost">
2929
<h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" title="{{ post.title }}">{{ post.title }}</a></h2>
3030
<p itemprop="text">{% if post.description %}{{ post.description }}{% else %}{{ post.content | strip_html | strip_newlines | truncate: 120 }}{% endif %}</p>
@@ -34,11 +34,11 @@ <h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" ti
3434

3535
<div class="footer-wrap">
3636
<footer>
37-
{% include footer.html %}
37+
{% include _footer.html %}
3838
</footer>
3939
</div><!-- /.footer-wrap -->
4040

41-
{% include scripts.html %}
41+
{% include _scripts.html %}
4242

4343
</body>
4444
</html>

‎_layouts/page.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
55
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
66
<head>
7-
{% include head.html %}
7+
{% include _head.html %}
88
</head>
99

1010
<body class="page" itemscope itemtype="http://schema.org/WebPage">
1111

12-
{% include browser-upgrade.html %}
12+
{% include _browser-upgrade.html %}
1313

14-
{% include navigation.html %}
14+
{% include _navigation.html %}
1515

1616
{% if page.image.feature %}<div class="image-wrap">
1717
<img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
1818
{% if page.image.credit %}<span class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></span>{% endif %}
1919
</div><!-- /.image-wrap -->{% endif %}
2020

2121
<div id="main" role="main" itemprop="mainContentOfPage">
22-
<div class="article-author-top">
23-
{% include author-bio.html %}
22+
<div class="article-author-side">
23+
{% include _author-bio.html %}
2424
</div>
2525
<article itemscope itemtype="http://schema.org/CreativeWork">
2626
<h1 itemprop="name">{{ page.title }}</h1>
@@ -32,11 +32,11 @@ <h1 itemprop="name">{{ page.title }}</h1>
3232

3333
<div class="footer-wrap">
3434
<footer>
35-
{% include footer.html %}
35+
{% include _footer.html %}
3636
</footer>
3737
</div><!-- /.footer-wrap -->
3838

39-
{% include scripts.html %}
39+
{% include _scripts.html %}
4040

4141
</body>
4242
</html>

‎_layouts/post-index.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
55
<!--[if gt IE 8]><!--> <html class="no-js" lang="en"><!--<![endif]-->
66
<head>
7-
{% include head.html %}
7+
{% include _head.html %}
88
</head>
99

1010
<body class="articles" itemscope itemtype="http://schema.org/WebPage">
1111

12-
{% include browser-upgrade.html %}
12+
{% include _browser-upgrade.html %}
1313

14-
{% include navigation.html %}
14+
{% include _navigation.html %}
1515

1616
{% if page.image.feature %}<div class="image-wrap">
1717
<img src="{{ site.url }}/images/{{ page.image.feature }}" alt="{{ page.title }} feature image" itemprop="primaryImageOfPage">
1818
{% if page.image.credit %}<span class="image-credit">Photo Credit: <a href="{{ page.image.creditlink }}">{{ page.image.credit }}</a></span>{% endif %}
1919
</div><!-- /.image-wrap -->{% endif %}
2020

21-
<div class="article-author-top">
22-
{% include author-bio.html %}
21+
<div class="article-author-side">
22+
{% include _author-bio.html %}
2323
</div>
2424

2525
<div id="index" itemprop="mainContentOfPage" itemscope itemtype="http://schema.org/Blog">
@@ -43,11 +43,11 @@ <h2 itemprop="headline"><a href="{{ site.url }}{{ post.url }}" rel="bookmark" ti
4343

4444
<div class="footer-wrap">
4545
<footer>
46-
{% include footer.html %}
46+
{% include _footer.html %}
4747
</footer>
4848
</div><!-- /.footer-wrap -->
4949

50-
{% include scripts.html %}
50+
{% include _scripts.html %}
5151

5252
</body>
5353
</html>

0 commit comments

Comments
 (0)