Skip to content

Commit 3b457aa

Browse files
mmistakesmmistakes
committed
Merge branch 'release/4.0.8'
2 parents 6375f26 + 072fd29 commit 3b457aa

9 files changed

+60
-42
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## [4.0.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8)
2+
3+
### Bug Fixes
4+
5+
- Set default value for `words_per_minute`. [#657](https://github.com/mmistakes/minimal-mistakes/issues/657)
6+
- Adjust sidebar navigation list CSS so it collapses at the correct width.
7+
8+
### Maintenance
9+
10+
- Add Google AdSense banner to `/docs/_layouts/default.html` for demo site.
11+
112
## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
213

314
### Enhancements

‎_includes/read-time.html

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1+
{% assign words_per_minute = site.words_per_minute | default: 200 %}
2+
13
{% if post.read_time %}
24
{% assign words = post.content | strip_html | number_of_words %}
35
{% elsif page.read_time %}
46
{% assign words = page.content | strip_html | number_of_words %}
57
{% endif %}
68

7-
{% if site.words_per_minute %}
8-
{% if words < 180 %}
9-
{{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
10-
{% elsif words < 360 %}
11-
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
12-
{% else %}
13-
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
14-
{% endif %}
9+
{% if words < 180 %}
10+
{{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
11+
{% elsif words < 360 %}
12+
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
1513
{% else %}
16-
{{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }}
14+
{{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
1715
{% endif %}

‎_sass/_navigation.scss

+3-3
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
display: none;
322322
}
323323

324-
@include breakpoint(max-width $large) {
324+
@include breakpoint(max-width ($large - 1px)) {
325325

326326
label {
327327
position: relative;
@@ -428,7 +428,7 @@
428428
}
429429
}
430430

431-
@include breakpoint(max-width $large) {
431+
@include breakpoint(max-width ($large - 1px)) {
432432
position: relative;
433433
max-height: 0;
434434
opacity: 0;
@@ -442,7 +442,7 @@
442442
}
443443
}
444444

445-
@include breakpoint(max-width $large) {
445+
@include breakpoint(max-width ($large - 1px)) {
446446
.nav__list input:checked ~ .nav__items {
447447
-webkit-transition: 0.5s ease-in-out;
448448
transition: 0.5s ease-in-out;

‎docs/_docs/18-history.md

+12-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,20 @@ permalink: /docs/history/
44
excerpt: "Change log of enhancements and bug fixes made to the theme."
55
sidebar:
66
nav: docs
7-
modified: 2016-11-17T15:55:48-05:00
7+
modified: 2016-11-21T09:54:38-05:00
88
---
99

10+
## [4.0.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8)
11+
12+
### Bug Fixes
13+
14+
- Set default value for `words_per_minute`. [#657](https://github.com/mmistakes/minimal-mistakes/issues/657)
15+
- Adjust sidebar navigation list CSS so it collapses at the correct width.
16+
17+
### Maintenance
18+
19+
- Add Google AdSense banner to `/docs/_layouts/default.html` for demo site.
20+
1021
## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
1122

1223
### Enhancements

‎docs/_includes/read-time.html

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
1+
{% assign words_per_minute = site.words_per_minute | default: 200 %}
2+
13
{% if post.read_time %}
24
{% assign words = post.content | strip_html | number_of_words %}
35
{% elsif page.read_time %}
46
{% assign words = page.content | strip_html | number_of_words %}
57
{% endif %}
68

7-
{% if site.words_per_minute %}
8-
{% if words < 180 %}
9-
{{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
10-
{% elsif words < 360 %}
11-
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
12-
{% else %}
13-
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
14-
{% endif %}
9+
{% if words < 180 %}
10+
{{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
11+
{% elsif words < 360 %}
12+
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
1513
{% else %}
16-
{{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }}
14+
{{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
1715
{% endif %}

‎docs/_pages/home.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ header:
77
cta_label: "<i class='fa fa-download'></i> Install Now"
88
cta_url: "/docs/quick-start-guide/"
99
caption:
10-
excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7">Latest release v4.0.7</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
10+
excerpt: 'A flexible two-column Jekyll theme. Perfect for personal sites, blogs, and portfolios hosted on GitHub or your own server.<br /> <small><a href="https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8">Latest release v4.0.8</a></small><br /><br /> {::nomarkdown}<iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=star&count=true&size=large" frameborder="0" scrolling="0" width="160px" height="30px"></iframe> <iframe style="display: inline-block;" src="https://ghbtns.com/github-btn.html?user=mmistakes&repo=minimal-mistakes&type=fork&count=true&size=large" frameborder="0" scrolling="0" width="158px" height="30px"></iframe>{:/nomarkdown}'
1111
feature_row:
1212
- image_path: /assets/images/mm-customizable-feature.png
1313
alt: "customizable"

‎docs/_sass/_navigation.scss

+17-17
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
display: none;
322322
}
323323

324-
@include breakpoint(max-width $large) {
324+
@include breakpoint(max-width ($large - 1px)) {
325325

326326
label {
327327
position: relative;
@@ -385,23 +385,23 @@
385385
input:checked + label:hover:after {
386386
transform: rotate(0);
387387
}
388-
}
389388

390-
ul {
391-
margin-bottom: 1em;
392-
}
389+
ul {
390+
margin-bottom: 1em;
391+
}
393392

394-
a {
395-
display: block;
396-
padding: 0.25em 0;
393+
a {
394+
display: block;
395+
padding: 0.25em 0;
397396

398-
@include breakpoint($large) {
399-
padding-top: 0.125em;
400-
padding-bottom: 0.125em;
401-
}
397+
@include breakpoint($large) {
398+
padding-top: 0.125em;
399+
padding-bottom: 0.125em;
400+
}
402401

403-
&:hover {
404-
text-decoration: underline;
402+
&:hover {
403+
text-decoration: underline;
404+
}
405405
}
406406
}
407407
}
@@ -428,7 +428,7 @@
428428
}
429429
}
430430

431-
@include breakpoint(max-width $large) {
431+
@include breakpoint(max-width ($large - 1px)) {
432432
position: relative;
433433
max-height: 0;
434434
opacity: 0;
@@ -442,13 +442,13 @@
442442
}
443443
}
444444

445-
@include breakpoint(max-width $large) {
445+
@include breakpoint(max-width ($large - 1px)) {
446446
.nav__list input:checked ~ .nav__items {
447447
-webkit-transition: 0.5s ease-in-out;
448448
transition: 0.5s ease-in-out;
449449
max-height: 100vh;
450-
opacity: 1;
451450
overflow: visible;
451+
opacity: 1;
452452
margin-top: 1em;
453453
-webkit-transform: translate(0, 0);
454454
-ms-transform: translate(0, 0);

‎minimal-mistakes-jekyll.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Gem::Specification.new do |spec|
44
spec.name = "minimal-mistakes-jekyll"
5-
spec.version = "4.0.7"
5+
spec.version = "4.0.8"
66
spec.authors = ["Michael Rose"]
77

88
spec.summary = %q{A flexible two-column Jekyll theme.}

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "minimal-mistakes",
3-
"version": "4.0.7",
3+
"version": "4.0.8",
44
"description": "Minimal Mistakes Jekyll theme npm build scripts",
55
"repository": {
66
"type": "git",

0 commit comments

Comments
 (0)