Merge branch 'release/4.0.8'

This commit is contained in:
Michael Rose 2016-11-21 09:56:29 -05:00
commit 3b457aa8f1
9 changed files with 61 additions and 43 deletions

View file

@ -1,3 +1,14 @@
## [4.0.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8)
### Bug Fixes
- Set default value for `words_per_minute`. [#657](https://github.com/mmistakes/minimal-mistakes/issues/657)
- Adjust sidebar navigation list CSS so it collapses at the correct width.
### Maintenance
- Add Google AdSense banner to `/docs/_layouts/default.html` for demo site.
## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
### Enhancements

View file

@ -1,17 +1,15 @@
{% assign words_per_minute = site.words_per_minute | default: 200 %}
{% if post.read_time %}
{% assign words = post.content | strip_html | number_of_words %}
{% elsif page.read_time %}
{% assign words = page.content | strip_html | number_of_words %}
{% endif %}
{% if site.words_per_minute %}
{% if words < 180 %}
{{ 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 < 360 %}
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% else %}
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% endif %}
{% if words < 180 %}
{{ 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 < 360 %}
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% else %}
{{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }}
{{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% endif %}

View file

@ -321,7 +321,7 @@
display: none;
}
@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
label {
position: relative;
@ -428,7 +428,7 @@
}
}
@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
position: relative;
max-height: 0;
opacity: 0;
@ -442,7 +442,7 @@
}
}
@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
.nav__list input:checked ~ .nav__items {
-webkit-transition: 0.5s ease-in-out;
transition: 0.5s ease-in-out;

View file

@ -4,9 +4,20 @@ permalink: /docs/history/
excerpt: "Change log of enhancements and bug fixes made to the theme."
sidebar:
nav: docs
modified: 2016-11-17T15:55:48-05:00
modified: 2016-11-21T09:54:38-05:00
---
## [4.0.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.8)
### Bug Fixes
- Set default value for `words_per_minute`. [#657](https://github.com/mmistakes/minimal-mistakes/issues/657)
- Adjust sidebar navigation list CSS so it collapses at the correct width.
### Maintenance
- Add Google AdSense banner to `/docs/_layouts/default.html` for demo site.
## [4.0.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.0.7)
### Enhancements

View file

@ -1,17 +1,15 @@
{% assign words_per_minute = site.words_per_minute | default: 200 %}
{% if post.read_time %}
{% assign words = post.content | strip_html | number_of_words %}
{% elsif page.read_time %}
{% assign words = page.content | strip_html | number_of_words %}
{% endif %}
{% if site.words_per_minute %}
{% if words < 180 %}
{{ 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 < 360 %}
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% else %}
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% endif %}
{% if words < 180 %}
{{ 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 < 360 %}
1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% else %}
{{ site.data.ui-text[site.locale].undefined_wpm | "Undefined parameter words_per_minute at _config.yml" }}
{{ words | divided_by:words_per_minute }} {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
{% endif %}

View file

@ -7,7 +7,7 @@ header:
cta_label: "<i class='fa fa-download'></i> Install Now"
cta_url: "/docs/quick-start-guide/"
caption:
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}'
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}'
feature_row:
- image_path: /assets/images/mm-customizable-feature.png
alt: "customizable"

View file

@ -321,7 +321,7 @@
display: none;
}
@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
label {
position: relative;
@ -385,23 +385,23 @@
input:checked + label:hover:after {
transform: rotate(0);
}
}
ul {
margin-bottom: 1em;
}
a {
display: block;
padding: 0.25em 0;
@include breakpoint($large) {
padding-top: 0.125em;
padding-bottom: 0.125em;
ul {
margin-bottom: 1em;
}
&:hover {
text-decoration: underline;
a {
display: block;
padding: 0.25em 0;
@include breakpoint($large) {
padding-top: 0.125em;
padding-bottom: 0.125em;
}
&:hover {
text-decoration: underline;
}
}
}
}
@ -428,7 +428,7 @@
}
}
@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
position: relative;
max-height: 0;
opacity: 0;
@ -442,13 +442,13 @@
}
}
@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
.nav__list input:checked ~ .nav__items {
-webkit-transition: 0.5s ease-in-out;
transition: 0.5s ease-in-out;
max-height: 100vh;
opacity: 1;
overflow: visible;
opacity: 1;
margin-top: 1em;
-webkit-transform: translate(0, 0);
-ms-transform: translate(0, 0);

View file

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

View file

@ -1,6 +1,6 @@
{
"name": "minimal-mistakes",
"version": "4.0.7",
"version": "4.0.8",
"description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": {
"type": "git",