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

+5-5
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

+9-9
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

+7-7
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

+7-7
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>

‎_layouts/post.html

+8-8
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="article" 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" itemscope itemtype="http://schema.org/Blog">
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/BlogPosting" itemprop="blogPost">
2626
<div class="headline-wrap">
@@ -32,7 +32,7 @@ <h2>{{ page.tagline }}</h2>
3232
<hr />
3333
<footer role="contentinfo">
3434
<div class="article-author-bottom">
35-
{% include author-bio.html %}
35+
{% include _author-bio.html %}
3636
</div>
3737
<p class="byline"><strong>{{ page.title }}</strong> was published on <time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished">{{ page.date | date: "%B %d, %Y" }}</time>{% if page.modified %} and last modified on <time datetime="{{ page.modified | date: "%Y-%m-%d" }}" itemprop="dateModified">{{ page.modified | date: "%B %d, %Y" }}</time>{% endif %} by <span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span>.</p>
3838
</footer>
@@ -59,11 +59,11 @@ <h4>You might also enjoy <small class="pull-right">(<a href="{{ site.url }}/arti
5959
<hr />
6060
</div><!-- /.related-articles -->{% endif %}
6161
<footer>
62-
{% include footer.html %}
62+
{% include _footer.html %}
6363
</footer>
6464
</div><!-- /.footer-wrap -->
6565

66-
{% include scripts.html %}
66+
{% include _scripts.html %}
6767

6868
</body>
6969
</html>

‎about.md

+5-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@ Jekyll is pretty rad and figured releasing a cleaned up version of [my site](htt
1717

1818
* Responsive templates. Looking good on mobile, tablet, and desktop.
1919
* Gracefully degrading in older browsers. Compatible with Internet Explorer 8+ and all modern browsers.
20-
* Minimal embellishments. Content first --- other widget nonsense never.
20+
* Minimal embellishments --- content first.
2121
* Large feature images for posts and pages.
22+
* Author sidebar to pimp your bio, photo[^2], and social media links.
2223
* Simple and clear permalink structure *(ie: domain.com/category/post-title)*
2324

2425
<a markdown="0" href="{{ site.url }}/theme-setup" class="btn">Install Minimal Mistakes Theme</a>
2526

26-
[^1]: Since open sourcing this theme I have released a couple other Jekyll themes. My website [Made Mistakes](http://mademistakes.com) is currently using a modified version of my [So Simple Theme](http://mmistakes.github.io/so-simple-theme/).
27+
[^1]: Since open sourcing this theme I have released a couple other Jekyll themes. My website [Made Mistakes](http://mademistakes.com) is currently using a modified version of my [So Simple Theme](http://mmistakes.github.io/so-simple-theme/).
28+
29+
[^2]: Fancy avatars provided by [Brandon Mathis](http://brandonmathis.com/projects/fancy-avatars/demo/) under a [Creative Commons Attribution 3.0 License](http://creativecommons.org/licenses/by/3.0/).

‎articles.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
layout: post-index
3-
permalink: /articles/index.html
3+
permalink: /articles/
44
title: Articles
55
tagline: A List of Posts
66
tags: [blog, graphic design]

‎assets/css/ie.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/main.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/less/1382.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
.prefix(12,4);
3838
.suffix(12,3.5);
3939
}
40-
.article-author-top {
40+
.article-author-side {
4141
.grid(12,1.5);
4242
.prefix(12,2);
4343
}

‎assets/less/600.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
.prefix(12,3);
4141
.suffix(12,3);
4242
}
43-
.article-author-top {
43+
.article-author-side {
4444
display: block;
4545
.grid(12,2);
4646
.prefix(12,0.5);

‎assets/less/992.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// TEXTURE ====================================================
44
// ELEMENTS ===================================================
55
// LAYOUT =====================================================
6-
.article-author-top,
6+
.article-author-side,
77
.article-author-bottom {
88
h3,
99
.bio-photo,

‎assets/less/page.less

+2-17
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ body {
7575
h2 {
7676
margin-bottom: 4px;
7777
.font-rem(20);
78-
text-transform: uppercase;
7978
}
8079
p {
8180
.font-rem(14);
@@ -118,7 +117,7 @@ body {
118117
clear: both;
119118
font-size: 80%;
120119
}
121-
.article-author-top,
120+
.article-author-side,
122121
.article-author-bottom {
123122
h3 {
124123
margin-bottom: 0;
@@ -151,7 +150,7 @@ body {
151150
.translate(0, 2px);
152151
}
153152
}
154-
.article-author-top {
153+
.article-author-side {
155154
display: none;
156155
}
157156
.article-author-bottom {
@@ -294,30 +293,17 @@ body {
294293
.container();
295294
.clearfix();
296295
clear: both;
297-
margin-top: 1em;
298-
padding-top: 2em;
299296
padding-bottom: 3em;
300-
background-color: @black;
301297
a,
302298
a:active,
303299
a:visited,
304300
p,
305301
h4,
306302
h5,
307303
h6,
308-
span {
309-
color: darken(@white, 25);
310-
}
311304
span {
312305
.font-rem(14);
313306
}
314-
a {
315-
border-bottom: 0 solid transparent;
316-
&:hover {
317-
color: @white;
318-
border-bottom: 0 solid transparent;
319-
}
320-
}
321307
footer {
322308
.grid(12,10);
323309
.prefix(12,1);
@@ -336,7 +322,6 @@ body {
336322
}
337323
li {
338324
margin-bottom: 0;
339-
color: @white;
340325
}
341326
}
342327
.footer-icons {

‎assets/less/typography.less

+2-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ blockquote {
103103
// --------------------------------------------------
104104
.footnotes {
105105
ol, li, p {
106-
.font-size(14);
106+
margin-bottom: 0;
107+
.font-rem(14);
107108
}
108109
}
109110

‎images/bio-photo.jpg

-5.29 KB
Loading

‎theme-setup.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ General notes and suggestions for customizing Minimal Mistakes.
3333
{% highlight text %}
3434
minimal-mistakes/
3535
├── _includes/
36-
| ├── author-bio.html #bio stuff goes here
37-
| ├── browser-upgrade.html #displays on IE8 and less
38-
| ├── footer.html #site footer
39-
| ├── head.html #site head
40-
| ├── navigation.html #site top nav
41-
| └── scripts.html #jQuery, plugins, GA, etc.
36+
| ├── _author-bio.html #bio stuff goes here
37+
| ├── _browser-upgrade.html #displays on IE8 and less
38+
| ├── _footer.html #site footer
39+
| ├── _head.html #site head
40+
| ├── _navigation.html #site top nav
41+
| └── _scripts.html #jQuery, plugins, GA, etc.
4242
├── _layouts/
4343
| ├── home.html #homepage layout
4444
| ├── page.html #page layout
@@ -69,7 +69,7 @@ Most of the variables found here are used in the .html files found in `_includes
6969

7070
#### Owner/Author Information
7171

72-
Change your name, bio, and avatar photo (100x100 pixels or larger), Twitter url, email, and Google+ url. If you want to link to an external image on Gravatar or something similiar you'll need to edit the path in `author-bio.html` since it assumes it is located in `\images`.
72+
Change your name, bio, and avatar photo (100x100 pixels or larger), Twitter url, email, and Google+ url. If you want to link to an external image on Gravatar or something similiar you'll need to edit the path in `_author-bio.html` since it assumes it is located in `\images`.
7373

7474
Including a link to your Google+ profile has the added benefit of displaying [Google Authorship](https://plus.google.com/authorship) in Google search results if you've went ahead and applied for it. Don't have a Google+ account? Just leave it blank.
7575

@@ -122,7 +122,7 @@ image:
122122

123123
#### Thumbnails for OG and Twitter Cards
124124

125-
Post and page thumbnails work the same way. These are used by [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) meta tags found in *head.html*. If you don't assign a thumbnail the default graphic *(default-thumb.png)* is used. I'd suggest changing this to something more meaningful --- your logo or avatar are good options.
125+
Post and page thumbnails work the same way. These are used by [Open Graph](https://developers.facebook.com/docs/opengraph/) and [Twitter Cards](https://dev.twitter.com/docs/cards) meta tags found in *_head.html*. If you don't assign a thumbnail the default graphic *(default-thumb.png)* is used. I'd suggest changing this to something more meaningful --- your logo or avatar are good options.
126126

127127
#### Table of Contents
128128

@@ -180,6 +180,6 @@ Having a problem getting something to work or want to know why I setup something
180180
This theme is free and open source software, distributed under the [GNU General Public License]({{ site.url }}/LICENSE) version 2 or later. So feel free to use this Jekyll theme on your site without linking back to me or including a disclaimer.
181181

182182

183-
[^1]: Used to generate absolute urls in `sitemap.xml`, `feed.xml`, and for canonical urls in `head.html`. Don't include a trailing `/` in your base url ie: `http://mademistakes.com`. When developing locally remove or comment out this line so local .css, .js, and images are used.
183+
[^1]: Used to generate absolute urls in `sitemap.xml`, `feed.xml`, and for canonical urls in `_head.html`. Don't include a trailing `/` in your base url ie: `http://mademistakes.com`. When developing locally remove or comment out this line so local .css, .js, and images are used.
184184

185185
[^2]: If you're using GitHub Pages to host your site be aware that plugins are disabled. So you'll need to build your site locally and then manually deploy if you want to use this sweet plugin.

0 commit comments

Comments
 (0)