From 958b39974164ed8798658781e2341178c3b25eb5 Mon Sep 17 00:00:00 2001 From: Nicolas Cavigneaux Date: Thu, 16 Mar 2017 15:21:13 +0100 Subject: [PATCH 1/3] Remove buggy conditional around related posts header (#901) This removes a buggy conditional that checks if `related_label` is available in translations before displaying the header for related posts but this header already handle missing translation by using a default string. With this fix the header is displayed even if the translation for this label isn't available. Fix #900 --- _layouts/single.html | 4 +--- docs/_layouts/single.html | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/_layouts/single.html b/_layouts/single.html index 599135026fb9..fd0e89be17a1 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -63,9 +63,7 @@

{{ site.data.ui-text[site.locale].meta_label }}

{% endcomment %} {% if page.id and page.related and site.related_posts.size > 0 %}
- {% if site.data.ui-text[site.locale].related_label %} -

{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

- {% endif %} +

{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

{% for post in site.related_posts limit:4 %} {% include archive-single.html type="grid" %} diff --git a/docs/_layouts/single.html b/docs/_layouts/single.html index 599135026fb9..fd0e89be17a1 100644 --- a/docs/_layouts/single.html +++ b/docs/_layouts/single.html @@ -63,9 +63,7 @@

{{ site.data.ui-text[site.locale].meta_label }}

{% endcomment %} {% if page.id and page.related and site.related_posts.size > 0 %}
- {% if site.data.ui-text[site.locale].related_label %} -

{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

- {% endif %} +

{{ site.data.ui-text[site.locale].related_label | default: "You May Also Enjoy" }}

{% for post in site.related_posts limit:4 %} {% include archive-single.html type="grid" %} From 365ff8d2db8488bcf3b8a757f78d5f09f1d51229 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 16 Mar 2017 10:29:21 -0400 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 6 ++++++ docs/_docs/18-history.md | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f11a14874ee5..e0179a58c7eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [4.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.1) + +### Bug Fixes + +- Correctly show Related Posts heading when UI Text data file is omitted and `related: true` in YAML Front Matter. [#901](https://github.com/mmistakes/minimal-mistakes/pull/901) + ## [4.3.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0) ### Enhancements diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index e5dfb7bc0608..0e553a6463c4 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -4,9 +4,15 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -modified: 2017-02-28T10:35:04-05:00 +modified: 2017-03-16T10:27:53-04:00 --- +## [4.3.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.1) + +### Bug Fixes + +- Correctly show Related Posts heading when UI Text data file is omitted and `related: true` in YAML Front Matter. [#901](https://github.com/mmistakes/minimal-mistakes/pull/901) + ## [4.3.0](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.3.0) ### Enhancements From b6e14cbf18dca898d8c200568181131ac7b8a77b Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Thu, 16 Mar 2017 10:31:43 -0400 Subject: [PATCH 3/3] Bump version to 4.3.1 --- assets/css/main.scss | 2 +- assets/js/main.min.js | 2 +- docs/assets/css/main.scss | 2 +- docs/assets/js/main.min.js | 2 +- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/css/main.scss b/assets/css/main.scss index c89e432de303..407ec05a6744 100644 --- a/assets/css/main.scss +++ b/assets/css/main.scss @@ -2,7 +2,7 @@ --- /*! - * Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose + * Minimal Mistakes Jekyll Theme 4.3.1 by Michael Rose * Copyright 2017 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt) */ diff --git a/assets/js/main.min.js b/assets/js/main.min.js index 07249d1e6469..d02dbc92dbd8 100644 --- a/assets/js/main.min.js +++ b/assets/js/main.min.js @@ -3,7 +3,7 @@ layout: --- /*! - * Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose + * Minimal Mistakes Jekyll Theme 4.3.1 by Michael Rose * Copyright 2017 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT */ diff --git a/docs/assets/css/main.scss b/docs/assets/css/main.scss index c89e432de303..407ec05a6744 100644 --- a/docs/assets/css/main.scss +++ b/docs/assets/css/main.scss @@ -2,7 +2,7 @@ --- /*! - * Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose + * Minimal Mistakes Jekyll Theme 4.3.1 by Michael Rose * Copyright 2017 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE.txt) */ diff --git a/docs/assets/js/main.min.js b/docs/assets/js/main.min.js index 07249d1e6469..d02dbc92dbd8 100644 --- a/docs/assets/js/main.min.js +++ b/docs/assets/js/main.min.js @@ -3,7 +3,7 @@ layout: --- /*! - * Minimal Mistakes Jekyll Theme 4.3.0 by Michael Rose + * Minimal Mistakes Jekyll Theme 4.3.1 by Michael Rose * Copyright 2017 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT */ diff --git a/minimal-mistakes-jekyll.gemspec b/minimal-mistakes-jekyll.gemspec index e5755357d079..411676c3a97e 100644 --- a/minimal-mistakes-jekyll.gemspec +++ b/minimal-mistakes-jekyll.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "minimal-mistakes-jekyll" - spec.version = "4.3.0" + spec.version = "4.3.1" spec.authors = ["Michael Rose"] spec.summary = %q{A flexible two-column Jekyll theme.} diff --git a/package.json b/package.json index 2dfc6ba94615..d36d2cb03e05 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "4.3.0", + "version": "4.3.1", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",