From 92f94d55496702910cab3318b2f7596cfe9367c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Ganzenm=C3=BCller?= Date: Mon, 31 Aug 2020 02:30:38 +0200 Subject: [PATCH 01/11] Removed duplicated CSS definitions (#2666) --- _sass/minimal-mistakes/_footer.scss | 1 - _sass/minimal-mistakes/_sidebar.scss | 1 - 2 files changed, 2 deletions(-) diff --git a/_sass/minimal-mistakes/_footer.scss b/_sass/minimal-mistakes/_footer.scss index 71692a08..c0b0625b 100644 --- a/_sass/minimal-mistakes/_footer.scss +++ b/_sass/minimal-mistakes/_footer.scss @@ -8,7 +8,6 @@ margin-left: 0; margin-right: 0; width: 100%; - clear: both; margin-top: 3em; color: $muted-text-color; -webkit-animation: $intro-transition; diff --git a/_sass/minimal-mistakes/_sidebar.scss b/_sass/minimal-mistakes/_sidebar.scss index cff28c8c..b1f5ca98 100644 --- a/_sass/minimal-mistakes/_sidebar.scss +++ b/_sass/minimal-mistakes/_sidebar.scss @@ -185,7 +185,6 @@ vertical-align: middle; font-family: $sans-serif; z-index: 20; - position: relative; cursor: pointer; li:last-child { From b75f057a5eaa1f80d3d9d070299264c138c2a154 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 20:31:49 -0400 Subject: [PATCH 02/11] Update CHANGELOG and history --- CHANGELOG.md | 1 + docs/_docs/18-history.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 873ed74d..1c9b1eb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug Fixes +- Remove duplicate CSS definitions. [#2666](https://github.com/mmistakes/minimal-mistakes/pull/2666) - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index a8892f9a..a3ea029f 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,12 +5,13 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2020-08-04T12:59:39-04:00 +last_modified_at: 2020-08-30T20:31:39-04:00 toc: false --- ## Unreleased +- Remove duplicate CSS definitions. [#2666](https://github.com/mmistakes/minimal-mistakes/pull/2666) - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) From 24b45850847f014fbba43a669d873fa7b7ac5691 Mon Sep 17 00:00:00 2001 From: Lars Olesen Date: Mon, 31 Aug 2020 02:38:03 +0200 Subject: [PATCH 03/11] Added article:author used by Pinterest (#2670) --- _includes/seo.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_includes/seo.html b/_includes/seo.html index 9b60b7bb..7df1253b 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -52,6 +52,9 @@ {% if author.name %} + {% if og_type == "article" %} + + {% endif %} {% endif %} From 5b5b3ad4e085a7ae7a529e4dc2d53e436f36b068 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 20:41:43 -0400 Subject: [PATCH 04/11] Update CHANGELOG and history --- CHANGELOG.md | 4 ++++ docs/_docs/18-history.md | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c9b1eb1..7d7d5905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) +### Enhancements + +- Add `article:author` Open Graph markup. [#2670](https://github.com/mmistakes/minimal-mistakes/pull/2670) + ## [4.20.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.1) ### Bug Fixes diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index a3ea029f..f732bacd 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,7 +5,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2020-08-30T20:31:39-04:00 +last_modified_at: 2020-08-30T20:41:33-04:00 toc: false --- @@ -15,6 +15,10 @@ toc: false - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) +### Enhancements + +- Add `article:author` Open Graph markup. [#2670](https://github.com/mmistakes/minimal-mistakes/pull/2670) + ## [4.20.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.1) ### Bug Fixes From c6f10529a4904fbf29274c11a242114c6091cd55 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 20:52:12 -0400 Subject: [PATCH 05/11] Refactor page meta (#2641) * Rename include * Add grid view test pages * Rename `.post__meta-sep` and use CSS to add line break * Improve collection grid archive * Improve page grid archive * Enable `grid` * Don't show date icon if there is no `date` value * Add blank line at EOF * Add space * Wrap date and reading time in named `span` elements --- _includes/archive-single.html | 2 +- _includes/page__hero.html | 2 +- _includes/page__meta.html | 30 ++++++++++++++++++++ _includes/post__meta.html | 35 ------------------------ _layouts/single.html | 2 +- _sass/minimal-mistakes/_archive.scss | 8 ++++++ _sass/minimal-mistakes/_page.scss | 2 +- docs/_docs/05-configuration.md | 6 ++-- test/_pages/category-archive-grid.md | 7 +++++ test/_pages/collection-archive-grid.html | 28 +++++++++++++++++++ test/_pages/collection-archive.html | 4 +-- test/_pages/edge-case-grid.md | 9 ++++++ test/_pages/markup-grid.md | 9 ++++++ test/_pages/page-archive-grid.html | 16 +++++++++++ test/_pages/page-archive.html | 2 +- test/_pages/tag-archive-grid.md | 7 +++++ test/_pages/year-archive-grid.md | 7 +++++ 17 files changed, 131 insertions(+), 45 deletions(-) create mode 100644 _includes/page__meta.html delete mode 100644 _includes/post__meta.html create mode 100644 test/_pages/category-archive-grid.md create mode 100644 test/_pages/collection-archive-grid.html create mode 100644 test/_pages/edge-case-grid.md create mode 100644 test/_pages/markup-grid.md create mode 100644 test/_pages/page-archive-grid.html create mode 100644 test/_pages/tag-archive-grid.md create mode 100644 test/_pages/year-archive-grid.md diff --git a/_includes/archive-single.html b/_includes/archive-single.html index df4f8dfc..68174807 100644 --- a/_includes/archive-single.html +++ b/_includes/archive-single.html @@ -24,7 +24,7 @@ {{ title }} {% endif %} - {% include post__meta.html type=include.type %} + {% include page__meta.html type=include.type %} {% if post.excerpt %}

{{ post.excerpt | markdownify | strip_html | truncate: 160 }}

{% endif %} diff --git a/_includes/page__hero.html b/_includes/page__hero.html index 8e477535..3f55aaa6 100644 --- a/_includes/page__hero.html +++ b/_includes/page__hero.html @@ -31,7 +31,7 @@ {% elsif page.header.show_overlay_excerpt != false and page.excerpt %}

{{ page.excerpt | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% include post__meta.html %} + {% include page__meta.html %} {% if page.header.cta_url %}

{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}

{% endif %} diff --git a/_includes/page__meta.html b/_includes/page__meta.html new file mode 100644 index 00000000..1afc3d8f --- /dev/null +++ b/_includes/page__meta.html @@ -0,0 +1,30 @@ +{% assign document = post | default: page %} +{% if document.read_time or document.show_date %} +

+ {% if document.show_date and document.date %} + {% assign date = document.date %} + + + + + {% endif %} + + {% if document.read_time and document.show_date %}{% endif %} + + {% if document.read_time %} + {% assign words_per_minute = document.words_per_minute | default: site.words_per_minute | default: 200 %} + {% assign words = document.content | strip_html | number_of_words %} + + + + {% if words < words_per_minute %} + {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% elsif words == words_per_minute %} + 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% else %} + {{ words | divided_by: words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} + {% endif %} + + {% endif %} +

+{% endif %} diff --git a/_includes/post__meta.html b/_includes/post__meta.html deleted file mode 100644 index 1ea81e5b..00000000 --- a/_includes/post__meta.html +++ /dev/null @@ -1,35 +0,0 @@ -{% assign page = post | default: page %} - -{% if page.read_time or page.show_date %} -

- - {% if page.show_date %} - {% assign date = page.date %} - - - {% endif %} - - {% if page.read_time and page.show_date %} - {% if include.type == "grid" %} -
- {% else %} - - {% endif %} - {% endif %} - - {% if page.read_time %} - {% assign words_per_minute = page.words_per_minute | default: site.words_per_minute | default: 200 %} - {% assign words = page.content | strip_html | number_of_words %} - - - {% if words < words_per_minute %} - {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% elsif words == words_per_minute %} - 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% else %} - {{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }} - {% endif %} - {% endif %} - -

-{% endif %} \ No newline at end of file diff --git a/_layouts/single.html b/_layouts/single.html index 7116d72d..71cb4e83 100644 --- a/_layouts/single.html +++ b/_layouts/single.html @@ -27,7 +27,7 @@ layout: default {% unless page.header.overlay_color or page.header.overlay_image %}
{% if page.title %}

{{ page.title | markdownify | remove: "

" | remove: "

" }}

{% endif %} - {% include post__meta.html %} + {% include page__meta.html %}
{% endunless %} diff --git a/_sass/minimal-mistakes/_archive.scss b/_sass/minimal-mistakes/_archive.scss index 3df29961..9f576323 100644 --- a/_sass/minimal-mistakes/_archive.scss +++ b/_sass/minimal-mistakes/_archive.scss @@ -201,6 +201,14 @@ font-size: 0.6em; } + .page__meta-sep { + display: block; + + &::before { + display: none; + } + } + .archive__item-title { margin-top: 0.5em; font-size: $type-size-5; diff --git a/_sass/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/_page.scss index c4bf8ae7..f25f75f6 100644 --- a/_sass/minimal-mistakes/_page.scss +++ b/_sass/minimal-mistakes/_page.scss @@ -299,7 +299,7 @@ body { text-transform: uppercase; } -.post__meta-sep::before { +.page__meta-sep::before { content: "\2022"; padding-left: 0.5em; padding-right: 0.5em; diff --git a/docs/_docs/05-configuration.md b/docs/_docs/05-configuration.md index 3cb1de04..11c22a64 100644 --- a/docs/_docs/05-configuration.md +++ b/docs/_docs/05-configuration.md @@ -311,14 +311,14 @@ To disable reading time for a post, add `read_time: false` to its YAML Front Mat words_per_minute: 250 ``` -### Post meta separator +### Page meta separator -To customise the separator between the post date and reading time (if both are enabled), edit `.post__meta-sep::before` in a [custom stylesheet]({{ "/docs/stylesheets/" | relative_url }}). +To customise the separator between the page date and reading time (if both are enabled), edit `.page__meta-sep::before` in a [custom stylesheet]({{ "/docs/stylesheets/" | relative_url }}). For example, ```css -.post__meta-sep::before { +.page__meta-sep::before { content: "\2022"; padding-left: 0.5em; padding-right: 0.5em; diff --git a/test/_pages/category-archive-grid.md b/test/_pages/category-archive-grid.md new file mode 100644 index 00000000..3558be0a --- /dev/null +++ b/test/_pages/category-archive-grid.md @@ -0,0 +1,7 @@ +--- +title: "Posts by Category (grid view)" +layout: categories +permalink: /categories-grid/ +entries_layout: grid +author_profile: true +--- diff --git a/test/_pages/collection-archive-grid.html b/test/_pages/collection-archive-grid.html new file mode 100644 index 00000000..3280bf7b --- /dev/null +++ b/test/_pages/collection-archive-grid.html @@ -0,0 +1,28 @@ +--- +layout: archive +title: "Posts by Collection (grid view)" +permalink: /collection-archive-grid/ +entries_layout: grid +author_profile: true +--- + +{% assign entries_layout = page.entries_layout | default: 'list' %} +{% capture written_label %}'None'{% endcapture %} + +{% for collection in site.collections %} + {% unless collection.output == false or collection.label == "posts" %} +
+ {% capture label %}{{ collection.label }}{% endcapture %} + {% if label != written_label %} +

{{ label }}

+ {% capture written_label %}{{ label }}{% endcapture %} + {% endif %} +
+ {% for post in collection.docs %} + {% include archive-single.html type=entries_layout %} + {% endfor %} +
+ {{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} ↑ +
+ {% endunless %} +{% endfor %} diff --git a/test/_pages/collection-archive.html b/test/_pages/collection-archive.html index 80d28164..219592b6 100644 --- a/test/_pages/collection-archive.html +++ b/test/_pages/collection-archive.html @@ -17,7 +17,7 @@ author_profile: true {% endunless %} {% for post in collection.docs %} {% unless collection.output == false or collection.label == "posts" %} - {% include archive-single.html %} + {% include archive-single.html type=page.entries_layout %} {% endunless %} {% endfor %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/test/_pages/edge-case-grid.md b/test/_pages/edge-case-grid.md new file mode 100644 index 00000000..c2f73e5a --- /dev/null +++ b/test/_pages/edge-case-grid.md @@ -0,0 +1,9 @@ +--- +title: Edge Case (grid view) +layout: category +permalink: /categories/edge-case-grid/ +taxonomy: Edge Case +entries_layout: grid +--- + +Sample post listing for the category `Edge Case`. diff --git a/test/_pages/markup-grid.md b/test/_pages/markup-grid.md new file mode 100644 index 00000000..7ebf0bad --- /dev/null +++ b/test/_pages/markup-grid.md @@ -0,0 +1,9 @@ +--- +title: Markup (grid view) +layout: tag +permalink: /tags/markup-grid/ +taxonomy: markup +entries_layout: grid +--- + +Sample post listing for the tag `markup`. diff --git a/test/_pages/page-archive-grid.html b/test/_pages/page-archive-grid.html new file mode 100644 index 00000000..269dc2a1 --- /dev/null +++ b/test/_pages/page-archive-grid.html @@ -0,0 +1,16 @@ +--- +layout: archive +title: "Page Archive" +permalink: /page-archive-grid/ +entries_layout: grid +author_profile: false +--- + +{% assign entries_layout = page.entries_layout | default: 'list' %} +
+
+ {% for post in site.pages %} + {% include archive-single.html type=entries_layout %} + {% endfor %} +
+
diff --git a/test/_pages/page-archive.html b/test/_pages/page-archive.html index a4e515ab..ce11172e 100644 --- a/test/_pages/page-archive.html +++ b/test/_pages/page-archive.html @@ -7,4 +7,4 @@ author_profile: false {% for post in site.pages %} {% include archive-single.html %} -{% endfor %} \ No newline at end of file +{% endfor %} diff --git a/test/_pages/tag-archive-grid.md b/test/_pages/tag-archive-grid.md new file mode 100644 index 00000000..fa4df813 --- /dev/null +++ b/test/_pages/tag-archive-grid.md @@ -0,0 +1,7 @@ +--- +title: "Posts by Tag (grid view)" +permalink: /tags-grid/ +layout: tags +entries_layout: grid +author_profile: true +--- diff --git a/test/_pages/year-archive-grid.md b/test/_pages/year-archive-grid.md new file mode 100644 index 00000000..5029212c --- /dev/null +++ b/test/_pages/year-archive-grid.md @@ -0,0 +1,7 @@ +--- +title: "Posts by Year (grid view)" +permalink: /year-archive-grid/ +layout: posts +entries_layout: grid +author_profile: true +--- From 8cb95a700590af88b5536edea7b128aba5e1d768 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 20:53:16 -0400 Subject: [PATCH 06/11] Update CHANGELOG and history --- CHANGELOG.md | 1 + docs/_docs/18-history.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d7d5905..1f74b274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ ### Enhancements +- Refactor page meta include. [#2641](https://github.com/mmistakes/minimal-mistakes/pull/2641) - Add `article:author` Open Graph markup. [#2670](https://github.com/mmistakes/minimal-mistakes/pull/2670) ## [4.20.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.1) diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index f732bacd..6cb71698 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,7 +5,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2020-08-30T20:41:33-04:00 +last_modified_at: 2020-08-30T20:53:08-04:00 toc: false --- @@ -17,6 +17,7 @@ toc: false ### Enhancements +- Refactor page meta include. [#2641](https://github.com/mmistakes/minimal-mistakes/pull/2641) - Add `article:author` Open Graph markup. [#2670](https://github.com/mmistakes/minimal-mistakes/pull/2670) ## [4.20.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.1) From 2fcb13a8cc942a6f8d47930de9454cec3bdfa7da Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 21:15:36 -0400 Subject: [PATCH 07/11] Bump copyright year --- _layouts/default.html | 2 +- _sass/minimal-mistakes.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index 04517b1a..3c958d24 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -4,7 +4,7 @@ diff --git a/_sass/minimal-mistakes.scss b/_sass/minimal-mistakes.scss index 25f739d0..7c69bb27 100644 --- a/_sass/minimal-mistakes.scss +++ b/_sass/minimal-mistakes.scss @@ -1,6 +1,6 @@ /*! * Minimal Mistakes Jekyll Theme 4.20.1 by Michael Rose - * Copyright 2013-2019 Michael Rose - mademistakes.com | @mmistakes + * Copyright 2013-2020 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE) */ From e21035e62d32ddc1dfff076f7f45b19c1f29f7ae Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 21:25:30 -0400 Subject: [PATCH 08/11] Fix typo Close #2678 --- CHANGELOG.md | 1 + docs/_docs/10-layouts.md | 4 ++-- docs/_docs/18-history.md | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1f74b274..7010124d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug Fixes +- Fix typo in documentation. [#2678](https://github.com/mmistakes/minimal-mistakes/issues/2678) - Remove duplicate CSS definitions. [#2666](https://github.com/mmistakes/minimal-mistakes/pull/2666) - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) diff --git a/docs/_docs/10-layouts.md b/docs/_docs/10-layouts.md index 20d5be43..21674335 100644 --- a/docs/_docs/10-layouts.md +++ b/docs/_docs/10-layouts.md @@ -7,7 +7,7 @@ single_layout_gallery: alt: "single layout with header example" - image_path: /assets/images/mm-layout-single-meta.png alt: "single layout with comments and related posts" -last_modified_at: 2020-07-24T16:00:21-04:00 +last_modified_at: 2020-08-30T21:24:15-04:00 toc: true toc_label: "Included Layouts" toc_icon: "columns" @@ -625,7 +625,7 @@ To create a sidebar menu[^sidebar-menu] similar to the one found in the theme's
Custom sidebar navigation menu example.
-To start, add a new key to `_data/navigation.yml`. This will be referenced later in via YAML Front Matter so keep it short and memorable. In the case of the theme's documentation menu I used `docs`. +To start, add a new key to `_data/navigation.yml`. This will be referenced later via YAML Front Matter so keep it short and memorable. In the case of the theme's documentation menu I used `docs`. **Sample sidebar menu links:** diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index 6cb71698..96ed10de 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,12 +5,15 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2020-08-30T20:53:08-04:00 +last_modified_at: 2020-08-30T21:25:24-04:00 toc: false --- ## Unreleased +## Bug Fixes + +- Fix typo in documentation. [#2678](https://github.com/mmistakes/minimal-mistakes/issues/2678) - Remove duplicate CSS definitions. [#2666](https://github.com/mmistakes/minimal-mistakes/pull/2666) - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) From 8bec01b76dbb94d54ffd36fbb01841892ce37190 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Sun, 30 Aug 2020 21:28:31 -0400 Subject: [PATCH 09/11] Fix broken link in documentation Close #2677 --- CHANGELOG.md | 1 + docs/_docs/10-layouts.md | 4 ++-- docs/_docs/18-history.md | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7010124d..b3ecb3aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ### Bug Fixes +- Fix broken link in documentation. [#2677](https://github.com/mmistakes/minimal-mistakes/issues/2677) - Fix typo in documentation. [#2678](https://github.com/mmistakes/minimal-mistakes/issues/2678) - Remove duplicate CSS definitions. [#2666](https://github.com/mmistakes/minimal-mistakes/pull/2666) - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) diff --git a/docs/_docs/10-layouts.md b/docs/_docs/10-layouts.md index 21674335..458f169d 100644 --- a/docs/_docs/10-layouts.md +++ b/docs/_docs/10-layouts.md @@ -7,7 +7,7 @@ single_layout_gallery: alt: "single layout with header example" - image_path: /assets/images/mm-layout-single-meta.png alt: "single layout with comments and related posts" -last_modified_at: 2020-08-30T21:24:15-04:00 +last_modified_at: 2020-08-30T21:27:40-04:00 toc: true toc_label: "Included Layouts" toc_icon: "columns" @@ -224,7 +224,7 @@ If you're not using the `jekyll-archives` plugin then you need to create archive | [Category Archive](https://mmistakes.github.io/minimal-mistakes/categories/edge-case/) | `layout: category` | [edge-case.md](https://github.com/mmistakes/minimal-mistakes/blob/master/docs/_pages/edge-case.md) | | [Tags Archive](https://mmistakes.github.io/minimal-mistakes/tags/) | `layout: tags` | [tag-archive.md](https://github.com/mmistakes/minimal-mistakes/blob/master/docs/_pages/tag-archive.md) | | [Tag Archive](https://mmistakes.github.io/minimal-mistakes/tags/markup/) | `layout: tag` | [markup.md](https://github.com/mmistakes/minimal-mistakes/blob/master/docs/_pages/markup.md) | -| [Collection Archive](https://mmistakes.github.io/minimal-mistakes/recipes-archive/) | `layout: collection` | [recipes-archive.md](https://github.com/mmistakes/minimal-mistakes/blob/master/docs/_pages/recipes-archive.md) | +| [Collection Archive](https://mmistakes.github.io/minimal-mistakes/recipes/) | `layout: collection` | [recipes-archive.md](https://github.com/mmistakes/minimal-mistakes/blob/master/docs/_pages/recipes-archive.md) | **Note:** By default, documents are shown in a list view. To change to a grid view add `entries_layout: grid` to the page's front matter. {: .notice--info} diff --git a/docs/_docs/18-history.md b/docs/_docs/18-history.md index 96ed10de..d0e2f358 100644 --- a/docs/_docs/18-history.md +++ b/docs/_docs/18-history.md @@ -5,7 +5,7 @@ permalink: /docs/history/ excerpt: "Change log of enhancements and bug fixes made to the theme." sidebar: nav: docs -last_modified_at: 2020-08-30T21:25:24-04:00 +last_modified_at: 2020-08-30T21:28:27-04:00 toc: false --- @@ -13,6 +13,7 @@ toc: false ## Bug Fixes +- Fix broken link in documentation. [#2677](https://github.com/mmistakes/minimal-mistakes/issues/2677) - Fix typo in documentation. [#2678](https://github.com/mmistakes/minimal-mistakes/issues/2678) - Remove duplicate CSS definitions. [#2666](https://github.com/mmistakes/minimal-mistakes/pull/2666) - Fix `entries_layout: grid` in various layouts. [#2639](https://github.com/mmistakes/minimal-mistakes/issues/2639) From 526445bffe16c1975b02aba8b5c8e952a6bf81cc Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 7 Sep 2020 10:07:29 -0400 Subject: [PATCH 10/11] =?UTF-8?q?Release=204.20.2=20=F0=9F=92=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 +- README.md | 2 +- _layouts/default.html | 2 +- _sass/minimal-mistakes.scss | 2 +- assets/js/main.min.js | 7 +++++-- docs/_docs/01-quick-start-guide.md | 2 +- docs/_docs/04-upgrading.md | 6 +++--- docs/_docs/18-history.md | 4 ++-- docs/_layouts/default.html | 2 +- docs/_pages/home.md | 2 +- minimal-mistakes-jekyll.gemspec | 2 +- package.json | 2 +- 12 files changed, 19 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3ecb3aa..95e6ae2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## Unreleased +## [4.20.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.2) ### Bug Fixes diff --git a/README.md b/README.md index 2757638c..d7a12b51 100644 --- a/README.md +++ b/README.md @@ -126,7 +126,7 @@ To install: bundle ``` -4. Add `remote_theme: "mmistakes/minimal-mistakes@4.20.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry. +4. Add `remote_theme: "mmistakes/minimal-mistakes@4.20.2"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry. **Looking for an example?** Use the [Minimal Mistakes remote theme starter](https://github.com/mmistakes/mm-github-pages-starter/generate) for the quickest method of getting a GitHub Pages hosted site up and running. Generate a new repository from the starter, replace sample content with your own, and configure as needed. diff --git a/_layouts/default.html b/_layouts/default.html index 3c958d24..0e25dc7c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,7 +3,7 @@