merging into master

This commit is contained in:
Miguel Belardinelli Prytoluk 2020-09-10 10:48:37 -03:00
commit bdc8ac01e8
34 changed files with 173 additions and 68 deletions

View file

@ -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

View file

@ -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.

View file

@ -24,7 +24,7 @@
<a href="{{ post.url | relative_url }}" rel="permalink">{{ title }}</a>
{% endif %}
</h2>
{% include post__meta.html type=include.type %}
{% include page__meta.html type=include.type %}
{% if post.excerpt %}<p class="archive__item-excerpt" itemprop="description">{{ post.excerpt | markdownify | strip_html | truncate: 160 }}</p>{% endif %}
</article>
</div>

View file

@ -31,7 +31,7 @@
{% elsif page.header.show_overlay_excerpt != false and page.excerpt %}
<p class="page__lead">{{ page.excerpt | markdownify | remove: "<p>" | remove: "</p>" }}</p>
{% endif %}
{% include post__meta.html %}
{% include page__meta.html %}
{% if page.header.cta_url %}
<p><a href="{{ page.header.cta_url | relative_url }}" class="btn btn--light-outline btn--large">{{ page.header.cta_label | default: site.data.ui-text[site.locale].more_label | default: "Learn More" }}</a></p>
{% endif %}

30
_includes/page__meta.html Normal file
View file

@ -0,0 +1,30 @@
{% assign document = post | default: page %}
{% if document.read_time or document.show_date %}
<p class="page__meta">
{% if document.show_date and document.date %}
{% assign date = document.date %}
<span class="page__meta-date">
<i class="far {% if include.type == 'grid' and document.read_time and document.show_date %}fa-fw {% endif %}fa-calendar-alt" aria-hidden="true"></i>
<time datetime="{{ date | date_to_xmlschema }}">{{ date | date: "%B %-d, %Y" }}</time>
</span>
{% endif %}
{% if document.read_time and document.show_date %}<span class="page__meta-sep"></span>{% 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 %}
<span class="page__meta-readtime">
<i class="far {% if include.type == 'grid' and document.read_time and document.show_date %}fa-fw {% endif %}fa-clock" aria-hidden="true"></i>
{% 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 %}
</span>
{% endif %}
</p>
{% endif %}

View file

@ -1,35 +0,0 @@
{% assign page = post | default: page %}
{% if page.read_time or page.show_date %}
<p class="page__meta">
{% if page.show_date %}
{% assign date = page.date %}
<i class="far {% if include.type == 'grid' and page.read_time and page.show_date %}fa-fw {% endif %}fa-calendar-alt" aria-hidden="true"></i>
<time datetime="{{ date | date_to_xmlschema }}">{{ date | date: "%B %-d, %Y" }}</time>
{% endif %}
{% if page.read_time and page.show_date %}
{% if include.type == "grid" %}
<br \>
{% else %}
<span class="post__meta-sep"></span>
{% 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 %}
<i class="far {% if include.type == 'grid' and page.read_time and page.show_date %}fa-fw {% endif %}fa-clock" aria-hidden="true"></i>
{% 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 %}
</p>
{% endif %}

View file

@ -52,6 +52,9 @@
{% if author.name %}
<meta name="author" content="{{ author.name | default: author }}">
{% if og_type == "article" %}
<meta property="article:author" content="{{ author.name | default: author }}">
{% endif %}
{% endif %}
<meta property="og:type" content="{{ og_type }}">

View file

@ -3,8 +3,8 @@
<!doctype html>
<!--
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
Free for personal and commercial use under the MIT license
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE
-->

View file

@ -27,7 +27,7 @@ layout: default
{% unless page.header.overlay_color or page.header.overlay_image %}
<header>
{% if page.title %}<h1 id="page-title" class="page__title" itemprop="headline">{{ page.title | markdownify | remove: "<p>" | remove: "</p>" }}</h1>{% endif %}
{% include post__meta.html %}
{% include page__meta.html %}
</header>
{% endunless %}

View file

@ -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)
*/

View file

@ -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;

View file

@ -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;

View file

@ -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;

View file

@ -185,7 +185,6 @@
vertical-align: middle;
font-family: $sans-serif;
z-index: 20;
position: relative;
cursor: pointer;
li:last-child {

2
assets/js/main.min.js vendored Executable file → Normal file
View file

@ -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
*/

View file

@ -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"

View file

@ -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.

View file

@ -12,7 +12,7 @@ To check which version you are currently using, view the source of your built si
```
<!--
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
Free for personal and commercial use under the MIT license
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE
@ -28,14 +28,14 @@ Simply run `bundle update` if you're using Bundler (have a `Gemfile`) or `gem up
When using Bundler you can downgrade or lock the theme to a specific release ([tag](https://github.com/mmistakes/minimal-mistakes/tags)), branch, or commit. Instead of `gem "minimal-mistakes-jekyll"` you'd add the following to your `Gemfile`:
```ruby
gem "minimal-mistakes-jekyll", :git => "https://github.com/mmistakes/minimal-mistakes.git", :tag => "4.20.1"
gem "minimal-mistakes-jekyll", :git => "https://github.com/mmistakes/minimal-mistakes.git", :tag => "4.20.2"
```
For more information on [installing gems from git repositories](http://bundler.io/v1.16/guides/git.html) consult Bundler's documentation.
## Remote theme
When setting `remote_theme: "mmistakes/minimal-mistakes@4.20.1"` in your `_config.yml` 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.
When setting `remote_theme: "mmistakes/minimal-mistakes@4.20.2"` in your `_config.yml` 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.
For example you can roll back to release 4.8.1 with `mmistakes/minimal-mistakes@4.8.1` or a specific commit with `mmistakes/minimal-mistakes@bbf3cbc5fd64a3e1885f3f99eb90ba92af84063d`). For a complete list of theme versions consult the [releases page](https://github.com/mmistakes/minimal-mistakes/releases).

View file

@ -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;

View file

@ -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: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}
@ -625,7 +625,7 @@ To create a sidebar menu[^sidebar-menu] similar to the one found in the theme's
<figcaption>Custom sidebar navigation menu example.</figcaption>
</figure>
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:**

View file

@ -5,15 +5,25 @@ 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-09-07T10:03:41-04:00
toc: false
---
## 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

View file

@ -3,7 +3,7 @@
<!doctype html>
<!--
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
Free for personal and commercial use under the MIT license
https://github.com/mmistakes/minimal-mistakes/blob/master/LICENSE

View file

@ -10,7 +10,7 @@ header:
url: "/docs/quick-start-guide/"
excerpt: >
A flexible two-column Jekyll theme. Perfect for building personal sites, blogs, and portfolios.<br />
<small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.1">Latest release v4.20.1</a></small>
<small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.20.2">Latest release v4.20.2</a></small>
feature_row:
- image_path: /assets/images/mm-customizable-feature.png
alt: "customizable"

View file

@ -2,7 +2,7 @@
Gem::Specification.new do |spec|
spec.name = "minimal-mistakes-jekyll"
spec.version = "4.20.1"
spec.version = "4.20.2"
spec.authors = ["Michael Rose"]
spec.summary = %q{A flexible two-column Jekyll theme.}

View file

@ -1,6 +1,6 @@
{
"name": "minimal-mistakes",
"version": "4.20.1",
"version": "4.20.2",
"description": "Minimal Mistakes 2 column Jekyll theme.",
"repository": {
"type": "git",

View file

@ -0,0 +1,7 @@
---
title: "Posts by Category (grid view)"
layout: categories
permalink: /categories-grid/
entries_layout: grid
author_profile: true
---

View file

@ -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" %}
<section class="taxonomy__section">
{% capture label %}{{ collection.label }}{% endcapture %}
{% if label != written_label %}
<h2 id="{{ label | slugify }}" class="archive__subtitle">{{ label }}</h2>
{% capture written_label %}{{ label }}{% endcapture %}
{% endif %}
<div class="entries-{{ entries_layout }}">
{% for post in collection.docs %}
{% include archive-single.html type=entries_layout %}
{% endfor %}
</div>
<a href="#page-title" class="back-to-top">{{ site.data.ui-text[site.locale].back_to_top | default: 'Back to Top' }} &uarr;</a>
</section>
{% endunless %}
{% endfor %}

View file

@ -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 %}

View file

@ -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`.

View file

@ -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`.

View file

@ -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' %}
<section class="taxonomy__section">
<div class="entries-{{ entries_layout }}">
{% for post in site.pages %}
{% include archive-single.html type=entries_layout %}
{% endfor %}
</div>
</section>

View file

@ -0,0 +1,7 @@
---
title: "Posts by Tag (grid view)"
permalink: /tags-grid/
layout: tags
entries_layout: grid
author_profile: true
---

View file

@ -0,0 +1,7 @@
---
title: "Posts by Year (grid view)"
permalink: /year-archive-grid/
layout: posts
entries_layout: grid
author_profile: true
---