Skip to content

Commit

Permalink
Merge branch 'release/4.0.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmistakes
mmistakes committed Nov 21, 2016
2 parents 3400089 + 7f5763f commit 279ff79
Show file tree
Hide file tree
Showing 9 changed files with 60 additions and 42 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 7 additions & 9 deletions _includes/read-time.html
View file
Original file line number Diff line number Diff line change
@@ -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 %}
6 changes: 3 additions & 3 deletions _sass/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
display: none;
}

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

label {
position: relative;
Expand Down Expand Up @@ -428,7 +428,7 @@
}
}

@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
position: relative;
max-height: 0;
opacity: 0;
Expand All @@ -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;
Expand Down
13 changes: 12 additions & 1 deletion docs/_docs/18-history.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 7 additions & 9 deletions docs/_includes/read-time.html
View file
Original file line number Diff line number Diff line change
@@ -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 %}
2 changes: 1 addition & 1 deletion docs/_pages/home.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
34 changes: 17 additions & 17 deletions docs/_sass/_navigation.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@
display: none;
}

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

label {
position: relative;
Expand Down Expand Up @@ -385,23 +385,23 @@
input:checked + label:hover:after {
transform: rotate(0);
}
}

ul {
margin-bottom: 1em;
}
ul {
margin-bottom: 1em;
}

a {
display: block;
padding: 0.25em 0;
a {
display: block;
padding: 0.25em 0;

@include breakpoint($large) {
padding-top: 0.125em;
padding-bottom: 0.125em;
}
@include breakpoint($large) {
padding-top: 0.125em;
padding-bottom: 0.125em;
}

&:hover {
text-decoration: underline;
&:hover {
text-decoration: underline;
}
}
}
}
Expand All @@ -428,7 +428,7 @@
}
}

@include breakpoint(max-width $large) {
@include breakpoint(max-width ($large - 1px)) {
position: relative;
max-height: 0;
opacity: 0;
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion minimal-mistakes-jekyll.gemspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.}
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 279ff79

Please sign in to comment.