diff --git a/CHANGELOG.md b/CHANGELOG.md index 873ed74d..95e6ae2a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,18 @@ -## Unreleased +## [4.20.2](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.2) ### 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) - Change `fa` to `fas` for Font Awesome 5. [#2649](https://github.com/mmistakes/minimal-mistakes/pull/2649) +### 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) ### 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/_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/_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 %} diff --git a/_layouts/default.html b/_layouts/default.html index 04517b1a..0e25dc7c 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -3,8 +3,8 @@ 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.scss b/_sass/minimal-mistakes.scss index 25f739d0..4df5f7de 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 + * Minimal Mistakes Jekyll Theme 4.20.2 by Michael Rose + * Copyright 2013-2020 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT (https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE) */ 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/_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/_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/_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 { diff --git a/assets/js/main.min.js b/assets/js/main.min.js old mode 100755 new mode 100644 index 24d1443c..db820cf9 --- a/assets/js/main.min.js +++ b/assets/js/main.min.js @@ -1,5 +1,5 @@ /*! - * Minimal Mistakes Jekyll Theme 4.20.1 by Michael Rose + * Minimal Mistakes Jekyll Theme 4.20.2 by Michael Rose * Copyright 2013-2020 Michael Rose - mademistakes.com | @mmistakes * Licensed under MIT */ diff --git a/docs/_config.yml b/docs/_config.yml index 81912983..dedbf1ca 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -5,7 +5,7 @@ # For technical reasons, this file is *NOT* reloaded automatically when you use # `jekyll serve`. If you change this file, please restart the server process. -remote_theme : "mmistakes/minimal-mistakes@4.20.1" +remote_theme : "mmistakes/minimal-mistakes@4.20.2" minimal_mistakes_skin : "default" # "air", "aqua", "contrast", "dark", "dirt", "neon", "mint", "plum", "sunrise" diff --git a/docs/_docs/01-quick-start-guide.md b/docs/_docs/01-quick-start-guide.md index bcbb1c3e..84c89161 100644 --- a/docs/_docs/01-quick-start-guide.md +++ b/docs/_docs/01-quick-start-guide.md @@ -74,7 +74,7 @@ To install as a remote theme: 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. You may also optionally specify a branch, [tag](https://github.com/mmistakes/minimal-mistakes/tags), or commit to use by appending an @ and the Git ref (e.g., `mmistakes/minimal-mistakes@4.9.0` or `mmistakes/minimal-mistakes@bbf3cbc5fd64a3e1885f3f99eb90ba92af84063d`). This is useful when rolling back to older versions of the theme. If you don't specify a Git ref, the latest on `master` will be used. diff --git a/docs/_docs/04-upgrading.md b/docs/_docs/04-upgrading.md index a2a06474..8a3404d5 100644 --- a/docs/_docs/04-upgrading.md +++ b/docs/_docs/04-upgrading.md @@ -12,7 +12,7 @@ To check which version you are currently using, view the source of your built si ```