Compare commits

...
8 Commits
Author SHA1 Message Date
Michael Rose 5615f4c67f Merge branch 'hotfix/3.2.6' 2016-06-07 11:34:45 -04:00
Michael Rose 469fb46786 Update CHANGELOG and bump version to 3.2.6 2016-06-07 11:34:30 -04:00
Michael Rose f509db2177 Rename undefined_words_per_minute variable to match one set in ui-text.yml
- Remove extra white-space
- Close #317
2016-06-07 11:32:11 -04:00
Michael Rose 6bd7f637f3 Merge branch 'develop' of https://github.com/Scot3004/new into hotfix/3.2.6 2016-06-07 11:29:54 -04:00
Michael Rose a0082b1e1b Update README screenshots 2016-06-07 09:01:55 -04:00
Sergio C. Orozco Torres 01cfcf0f3b Undefined word_per_minutes parameter division by zero
If the parameter words_per_minute at _config.yml is not defined and the template says that must show read_time then will be divide a number by zero, a fix is verify that parameter and show a message when this is empty or zero. already localized for spanish
2016-06-07 01:03:59 -05:00
Michael Rose 1510947bf6 Merge branch 'hotfix/3.2.5' into develop 2016-06-06 22:30:48 -04:00
Michael Rose fba1cb3ffa Merge branch 'release/3.2.4' into develop 2016-06-06 21:28:08 -04:00
7 changed files with 20 additions and 8 deletions
+6
View File
@@ -1,3 +1,9 @@
## [3.2.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.6)
### Bug Fixes
- Fix error `Liquid Exception: divided by 0 in _includes/archive-single.html, included in _layouts/single.html` caused by null `words_per_minute` in `_config.yml`. [#345](https://github.com/mmistakes/minimal-mistakes/pull/345)
## [3.2.5](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.5)
### Bug Fixes
+2 -2
View File
@@ -5,11 +5,11 @@ Minimal Mistakes is a flexible two-column Jekyll theme. Perfect for hosting your
[![Minimal Mistakes live preview][2]][1]
[1]: https://mmistakes.github.io/minimal-mistakes/
[2]: https://cloud.githubusercontent.com/assets/1376749/14562643/d83b96c0-02eb-11e6-98d6-473fbfd3bff6.jpg (live preview)
[2]: images/mm-browser-mockups.png (live preview)
The theme includes responsive layouts (`single`, `archive`, and `splash` pages) that look great on mobile and desktop browsers.
![layout examples](https://cloud.githubusercontent.com/assets/1376749/14541626/dac474f4-0258-11e6-83f6-40e752028222.png)
![layout examples](images/mm-layout-examples.png)
## [Installation and Setup](https://mmistakes.github.io/minimal-mistakes/docs/quick-start-guide/) / [Preview the Theme](https://mmistakes.github.io/minimal-mistakes/)
+2
View File
@@ -27,6 +27,7 @@ en: &DEFAULT_EN
website_label : "Website"
email_label : "Email"
recent_posts : "Recent Posts"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
en-US:
<<: *DEFAULT_EN
en-UK:
@@ -59,6 +60,7 @@ es: &DEFAULT_ES
website_label : "Sitio web"
email_label : "Email"
recent_posts : "Entradas recientes"
undefined_wpm : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml"
es-ES:
<<: *DEFAULT_ES
es-CO:
+9 -5
View File
@@ -4,10 +4,14 @@
{% assign words = page.content | strip_html | number_of_words %}
{% endif %}
{% if words < 180 %}
{{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }}
{% elsif words < 360 %}
1 {{ site.data.ui-text[site.locale].minute_read }}
{% if site.words_per_minute %}
{% if words < 180 %}
{{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }}
{% elsif words < 360 %}
1 {{ site.data.ui-text[site.locale].minute_read }}
{% else %}
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }}
{% endif %}
{% else %}
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minutes_read }}
{{ site.data.ui-text[site.locale].undefined_wpm }}
{% endif %}
Binary file not shown.

After

Width:  |  Height:  |  Size: 206 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

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