From 157dcbbec6feb3aae1ac5f6f923b888ec62da193 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 18 Apr 2016 16:39:01 -0400 Subject: [PATCH 1/7] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 68d34eee3622..6152cec27a17 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages) ### Notable Features -- Compatible with GitHub Pages +- Compatible with Jekyll 3.x and GitHub Pages - Several layout options (single, archive, splash pages) - SEO optimized with support for [Twitter Cards](https://dev.twitter.com/cards/overview) and [Open Graph](http://ogp.me/) data - Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more. From 5bba54da0b2c869490b899988c1b602412f378d0 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 19 Apr 2016 08:43:21 -0400 Subject: [PATCH 2/7] Fix site.og_image URL by appending /images/ the path - Close #277 --- _includes/seo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/seo.html b/_includes/seo.html index 58f499b55161..d7068f180522 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -104,7 +104,7 @@ "@context": "http://schema.org", "@type": "Organization", "url": {{ seo_url | jsonify }}, - "logo": {{ site.og_image | prepend: "/" | prepend: seo_url | jsonify }} + "logo": {{ site.og_image | prepend: "/images/" | prepend: base_path | jsonify }} } {% endif %} From d463b26a836bc198dcf4af1e6eddb03a652439a3 Mon Sep 17 00:00:00 2001 From: Arto Kaitosaari Date: Mon, 25 Apr 2016 11:41:17 +0300 Subject: [PATCH 3/7] Fix "build:all" npm script The script "build:all" was missing the "npm run" section for the "build:js" part. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8634b25d34c2..307b58c35eb9 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,6 @@ "watch:all": "npm-run-all --parallel watch:css watch:js", "build:css": "npm run scss && npm run autoprefixer", "build:js": "npm run uglify", - "build:all": "npm run build:css && build:js" + "build:all": "npm run build:css && npm run build:js" } } From 02596110854fc5888a69409d0466168eab0691c5 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 27 Apr 2016 10:09:24 -0400 Subject: [PATCH 4/7] Remove white space as it was causing issues with Markdown and parsing as code blocks - Close #279 --- _includes/group-by-array | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/_includes/group-by-array b/_includes/group-by-array index 33af7555d0bc..251302c70bb1 100644 --- a/_includes/group-by-array +++ b/_includes/group-by-array @@ -20,28 +20,28 @@ {% assign __names = __names | sort %} {% for name in __names | sort %} - - {% unless name == previous %} + +{% unless name == previous %} - - {% assign group_names = group_names | push: name %} - {% endunless %} + +{% assign group_names = group_names | push: name %} +{% endunless %} - {% assign previous = name %} +{% assign previous = name %} {% endfor %} {% for name in group_names %} - - {% assign __item = __empty_array %} - {% for __element in include.collection %} - {% if __element[include.field] contains name %} - {% assign __item = __item | push: __element %} - {% endif %} - {% endfor %} - - - {% assign group_items = group_items | push: __item %} + +{% assign __item = __empty_array %} +{% for __element in include.collection %} +{% if __element[include.field] contains name %} +{% assign __item = __item | push: __element %} +{% endif %} {% endfor %} + + +{% assign group_items = group_items | push: __item %} +{% endfor %} \ No newline at end of file From 5c8506088ca5881a50749523e927331ff90ca475 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 27 Apr 2016 10:15:42 -0400 Subject: [PATCH 5/7] Allow `author_profile` to be toggled in a _layout (eg. archive-taxonomy.html) - Close #285 --- _includes/sidebar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index dbb7aae40775..445dd2078891 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -1,8 +1,8 @@ {% include base_path %} -{% if page.author_profile or page.sidebar %} +{% if page.author_profile or layout.author_profile or page.sidebar %}
- {% if page.author_profile %}{% include author-profile.html %}{% endif %} + {% if page.author_profile or layout.author_profile %}{% include author-profile.html %}{% endif %} {% if page.sidebar %} {% for s in page.sidebar %} {% if s.image %} From b459af212030d903b21ebc95b5fb180d23e4622f Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 27 Apr 2016 10:19:00 -0400 Subject: [PATCH 6/7] Fix SEO author bug - If `twitter.username` is set and `author.twitter` is nil bad things happen. - Close #289 --- _includes/seo.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/seo.html b/_includes/seo.html index d7068f180522..f914ce362f27 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -25,7 +25,7 @@ {% assign seo_description = seo_description | markdownify | strip_html | strip_newlines | escape_once %} {% endif %} -{% assign seo_author = page.author | default: page.authors[0] | default: site.author %} +{% assign seo_author = page.author | default: page.author[0] | default: site.author[0] %} {% if seo_author %} {% if seo_author.twitter %} {% assign seo_author_twitter = seo_author.twitter %} From 0103da2e7d095a48fda8a3f4638692abdeffa7dd Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Wed, 27 Apr 2016 10:57:47 -0400 Subject: [PATCH 7/7] Update CHANGELOG notes to version 3.1.3 --- CHANGELOG.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffb2e0f5ce25..90e4a95f1aea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +## [3.1.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.3) + +### Enhancements + +- Improve `site.locale` documentation [#284](https://github.com/mmistakes/minimal-mistakes/issues/284) +- Remove ProTip note about protocol-less `site.url` as it is an anti-pattern [#288](https://github.com/mmistakes/minimal-mistakes/issues/288) + +### Bug Fixes + +- Fix `og_image` URL in seo.html [#277](https://github.com/mmistakes/minimal-mistakes/issues/277) +- Fix `author_profile` toggle when assigned in a `_layout` [#285](https://github.com/mmistakes/minimal-mistakes/issues/285) +- Fix typo in `build:all` npm script [#283](https://github.com/mmistakes/minimal-mistakes/pull/283) +- Fix URL typo documentation [#287](https://github.com/mmistakes/minimal-mistakes/issues/287) +- SEO author bug. If `twitter.username` is set and `author.twitter` is `nil` bad things happen. [#289](https://github.com/mmistakes/minimal-mistakes/issues/289) + ## [3.1.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.1.2) ### Enhancement