From f3fd789041a95004360707d3cab490c8f8d2372c Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 1 Aug 2016 09:53:18 -0400 Subject: [PATCH 1/3] Remove Bug Fixes heading --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 90e316b7..8ccfee50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,6 @@ - Add Portuguese localized UI text. [#411](https://github.com/mmistakes/minimal-mistakes/pull/411) - Add Italian localized UI text. [#409](https://github.com/mmistakes/minimal-mistakes/pull/409) -### Bug Fixes - ### Maintenance - Remove unused Google AdSense variables in `_config.yml` [#404](https://github.com/mmistakes/minimal-mistakes/issues/404) From 3e2e7daa5151ab1cf14bc4d7681a59dcc437de5b Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 1 Aug 2016 10:27:54 -0400 Subject: [PATCH 2/3] Fix blank `site.teaser` bug - Use `assign` instead of capture and then check if variable is `nil` or not. - Close #412 --- _includes/archive-single.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/archive-single.html b/_includes/archive-single.html index 6b5eb494..e904447f 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -3,7 +3,7 @@ {% if post.header.teaser %} {% capture teaser %}{{ post.header.teaser }}{% endcapture %} {% else %} - {% capture teaser %}{{ site.teaser }}{% endcapture %} + {% assign teaser = site.teaser %} {% endif %} {% if post.id %} @@ -14,7 +14,7 @@
- {% if include.type == "grid" and teaser != blank %} + {% if include.type == "grid" and teaser %}
Date: Mon, 1 Aug 2016 10:28:53 -0400 Subject: [PATCH 3/3] Update CHANGELOG and bump version to 3.3.6 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ccfee50..043f8865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [3.3.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.6) + +### Bug Fixes + +- Fix blank `site.teaser` bug [#412](https://github.com/mmistakes/minimal-mistakes/issues/412) + ## [3.3.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.3.5) ### Enhancements diff --git a/package.json b/package.json index 8dcb5d66..d076ce82 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minimal-mistakes", - "version": "3.3.5", + "version": "3.3.6", "description": "Minimal Mistakes Jekyll theme npm build scripts", "repository": { "type": "git",