Compare commits

...
26 Commits
Author SHA1 Message Date
Michael Rose 7be7490c7f Merge branch 'release/3.2.9' 2016-06-13 12:27:21 -04:00
Michael Rose f997b7e744 Update CHANGELOG and bump version to 3.2.9 2016-06-13 12:27:05 -04:00
Michael Rose 13c3014ef9 Merge branch 'feature/og-overlay-image' into develop 2016-06-13 12:17:46 -04:00
Michael Rose 9524b60f7e Merge branch 'master' of https://github.com/jhabdas/minimal-mistakes into feature/og-overlay-image 2016-06-13 12:14:29 -04:00
Josh Habdas beaaa884ff Use header overlay images for Open Graph image 2016-06-13 11:03:48 -05:00
Michael Rose 66553093d6 Update github-pages gem and dependencies 2016-06-13 10:44:58 -04:00
Michael Rose cd019f496c Remove minutes_read to avoid awkward reading time wording
- Issue #356
2016-06-13 10:25:15 -04:00
Michael Rose b8934b19a9 Merge branch 'release/3.2.8' 2016-06-12 22:31:53 -04:00
Michael Rose f95f725c50 Merge branch 'release/3.2.8' into develop 2016-06-12 22:31:53 -04:00
Michael Rose 309c1f32e8 Update CHANGELOG and bump version to 3.2.8 2016-06-12 22:31:46 -04:00
Michael Rose 166b8f71bb Remove pointer cursor on author__urls that appears on white-space surrounding links.
- Close #354
2016-06-12 22:27:14 -04:00
Michael Rose 26f92debe1 Add contributing info to README
- Close #357
2016-06-12 22:26:18 -04:00
Michael Rose bf0e0df084 Merge branch 'release/3.2.7' into develop 2016-06-10 14:21:58 -04:00
Michael Rose e79d4e2a5a Merge branch 'release/3.2.7' 2016-06-10 14:21:54 -04:00
Michael Rose 0c86bb7e50 Update CHANGELOG and bump version to 3.2.7 2016-06-10 14:21:38 -04:00
Michael Rose 6f708cc505 Merge branch 'feature/yandex-alexa-patch' into develop 2016-06-10 14:18:27 -04:00
Michael Rose 427ff7d123 Merge branch 'patch-1' of https://github.com/jhabdas/minimal-mistakes into feature/yandex-alexa-patch 2016-06-10 14:17:56 -04:00
Michael Rose 866da4b829 Merge branch 'feature/fr-ui-text' into develop 2016-06-10 14:16:40 -04:00
Michael Rose 92faaaacdf Merge branch 'ui_texts' of https://github.com/flohw/minimal-mistakes into feature/fr-ui-text 2016-06-10 14:15:55 -04:00
Josh Habdas f3e5e0dafd Fix branch logic for Yandex and Alexa. Closes #347 2016-06-09 11:56:40 -05:00
Flohw 17eada19f7 Add missing translation 2016-06-08 19:27:09 +02:00
Flohw 5dc5156983 Add french translations 2016-06-08 19:07:38 +02:00
Michael Rose 66f0b6e099 Add Discourse link to README 2016-06-07 11:45:04 -04:00
Michael Rose 2c4f1d2614 Add Discourse link to README 2016-06-07 11:44:44 -04:00
Michael Rose d08f3fc6da Merge branch 'hotfix/3.2.6' into develop 2016-06-07 11:34:49 -04:00
Michael Rose 17058f6075 Update README screenshots 2016-06-07 09:01:38 -04:00
9 changed files with 118 additions and 28 deletions
+35
View File
@@ -1,3 +1,38 @@
## [3.2.9](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.9)
### Enhancements
- Add support for [header overlay images](https://mmistakes.github.io/minimal-mistakes/docs/layouts/#header-overlay) for Open Graph images. [#358](https://github.com/mmistakes/minimal-mistakes/pull/358)
### Bug Fixes
- Fix `Person` typo Schema.org type [#358](https://github.com/mmistakes/minimal-mistakes/pull/358)
### Maintenance
- Update `github-pages` gem and dependencies.
- Remove `minutes_read` to avoid awkward reading time wording [#356](https://github.com/mmistakes/minimal-mistakes/issues/356)
## [3.2.8](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.8)
### Bug Fixes
- Remove `cursor: pointer` that appears on white-space surrounding author side list items and links. [#354](https://github.com/mmistakes/minimal-mistakes/pull/354)
### Maintenance
- Add contributing information to `README.md`. [#357](https://github.com/mmistakes/minimal-mistakes/issues/357)
## [3.2.7](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.7)
### Enhancements
- Add French localized UI text. [#346](https://github.com/mmistakes/minimal-mistakes/pull/346)
### Bug Fixes
- Fix branch logic for Yandex and Alexa in `seo.html`. [#348](https://github.com/mmistakes/minimal-mistakes/pull/348)
## [3.2.6](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.2.6)
### Bug Fixes
+16 -12
View File
@@ -21,18 +21,18 @@ GEM
ffi (1.9.10)
ffi (1.9.10-x64-mingw32)
gemoji (2.1.0)
github-pages (80)
github-pages (82)
github-pages-health-check (= 1.1.0)
jekyll (= 3.1.6)
jekyll-coffeescript (= 1.0.1)
jekyll-feed (= 0.5.1)
jekyll-gist (= 1.4.0)
jekyll-github-metadata (= 1.11.1)
jekyll-github-metadata (= 2.0.0)
jekyll-mentions (= 1.1.2)
jekyll-paginate (= 1.1.0)
jekyll-redirect-from (= 0.10.0)
jekyll-sass-converter (= 1.3.0)
jekyll-seo-tag (= 1.4.0)
jekyll-seo-tag (= 2.0.0)
jekyll-sitemap (= 0.10.0)
jemoji (= 0.6.2)
kramdown (= 1.10.0)
@@ -65,7 +65,8 @@ GEM
jekyll-feed (0.5.1)
jekyll-gist (1.4.0)
octokit (~> 4.2)
jekyll-github-metadata (1.11.1)
jekyll-github-metadata (2.0.0)
jekyll (~> 3.1)
octokit (~> 4.0)
jekyll-mentions (1.1.2)
html-pipeline (~> 2.3)
@@ -75,8 +76,8 @@ GEM
jekyll (>= 2.0)
jekyll-sass-converter (1.3.0)
sass (~> 3.2)
jekyll-seo-tag (1.4.0)
jekyll (~> 3.0)
jekyll-seo-tag (2.0.0)
jekyll (~> 3.1)
jekyll-sitemap (0.10.0)
jekyll-watch (1.4.0)
listen (~> 3.0, < 3.1)
@@ -91,16 +92,19 @@ GEM
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9.7)
mercenary (0.3.6)
mini_portile2 (2.0.0)
mini_portile2 (2.1.0)
minitest (5.9.0)
multipart-post (2.0.0)
net-dns (0.8.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.7.2-x64-mingw32)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.8)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
nokogiri (1.6.8-x64-mingw32)
mini_portile2 (~> 2.1.0)
pkg-config (~> 1.1.7)
octokit (4.3.0)
sawyer (~> 0.7.0, >= 0.5.3)
pkg-config (1.1.7)
public_suffix (1.5.3)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
@@ -111,7 +115,7 @@ GEM
sawyer (0.7.0)
addressable (>= 2.3.5, < 2.5)
faraday (~> 0.8, < 0.10)
terminal-table (1.5.2)
terminal-table (1.6.0)
thread_safe (0.3.5)
typhoeus (0.8.0)
ethon (>= 0.8.0)
+21 -5
View File
@@ -19,8 +19,8 @@ The theme includes responsive layouts (`single`, `archive`, and `splash` pages)
- Several layout options (single, archive, splash pages)
- SEO optimized with support for [Twitter Cards](https://dev.twitter.com/cards/overview) and [Open Graph](http://ogp.me/) data
- Optional header images, sidebars, table of contents, galleries, related posts, breadcrumb links, and more.
- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, and custom)
- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom)
- Optional comments ([Disqus](https://disqus.com/), [Facebook](https://developers.facebook.com/docs/plugins/comments), Google+, [Discourse](https://www.discourse.org/), and custom).
- Optional analytics ([Google Analytics](https://www.google.com/analytics/) and custom).
#### Demo Pages
@@ -47,15 +47,29 @@ For even more demo pages check the [posts archive][year-archive].
---
### Credits
## Contributing
#### Icons + Demo Images:
Having trouble working with the theme? Found a typo in the documentation? Interested in adding a feature or [fixing a bug](https://github.com/mmistakes/minimal-mistakes/issues)? Then by all means [submit an issue](https://github.com/mmistakes/minimal-mistakes/issues/new) or [pull request](https://help.github.com/articles/using-pull-requests/). If this is your first pull request, it may be helpful to read up on the [GitHub Flow](https://guides.github.com/introduction/flow/) first.
Minimal Mistakes has been designed as a base for you to customize and fit your site's unique needs. Please keep this in mind when requesting features and/or submitting pull requests. If it's not something that most people will use, I probably won't consider it. When in doubt ask.
This goes for author sidebar links and "share button" additions -- I have no intention of merging in every possibly option, the essentials are there to get you started :smile:.
### Pull Requests
To help me out try to avoid creating pull requests on `master` and instead branch off of `develop`. It's much easier for me to test, merge, and roll them into new releases this way.
---
## Credits
### Icons + Demo Images:
- [The Noun Project](https://thenounproject.com) -- Garrett Knoll, Arthur Shlain, and [tracy tam](https://thenounproject.com/tracytam)
- [Font Awesome](http://fortawesome.github.io/Font-Awesome/)
- [Unsplash](https://unsplash.com/)
#### Other:
### Other:
- [Jekyll](http://jekyllrb.com/)
- [jQuery](http://jquery.com/)
@@ -69,6 +83,8 @@ For even more demo pages check the [posts archive][year-archive].
---
## License
The MIT License (MIT)
Copyright (c) 2016 Michael Rose
+36 -4
View File
@@ -12,7 +12,6 @@ en: &DEFAULT_EN
ext_link_label : "Direct Link"
less_than : "less than"
minute_read : "minute read"
minutes_read : "minutes read"
share_on_label : "Share on"
meta_label :
tags_label : "Tags:"
@@ -27,7 +26,7 @@ en: &DEFAULT_EN
website_label : "Website"
email_label : "Email"
recent_posts : "Recent Posts"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
undefined_wpm : "Undefined parameter words_per_minute at _config.yml"
en-US:
<<: *DEFAULT_EN
en-UK:
@@ -45,7 +44,6 @@ es: &DEFAULT_ES
ext_link_label : "Enlace"
less_than : "menos de"
minute_read : "minuto de lectura"
minutes_read : "minutos de lectura"
share_on_label : "Compartir"
meta_label :
tags_label : "Etiquetas:"
@@ -60,11 +58,45 @@ 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"
undefined_wpm : "Parametro words_per_minute (Palabras por minuto) no definido en _config.yml"
es-ES:
<<: *DEFAULT_ES
es-CO:
<<: *DEFAULT_ES
# French
# -----------------
fr: &DEFAULT_FR
page : "Page"
pagination_previous : "Précédent"
pagination_next : "Suivant"
breadcrumb_home_label : "Accueil"
breadcrumb_separator : "/"
toc_label : "Sur cette page"
ext_link_label : "Lien direct"
less_than : "plus petit que"
minute_read : "minute de lecture"
share_on_label : "Partager sur"
meta_label :
tags_label : "Tags :"
categories_label : "Catégories :"
date_label : "Mis à jour :"
comments_label : "Laisser un commentaire"
more_label : "Lire plus"
related_label : "Vous pourriez aimer"
follow_label : "Suivez moi"
feed_label : "Flux"
powered_by : "Propulsé par"
website_label : "Site"
email_label : "Email"
recent_posts : "Posts récents"
undefined_wpm : "Le paramètre words_per_minute n'est pas défini dans _config.yml"
fr-FR:
<<: *DEFAULT_FR
fr-BE:
<<: *DEFAULT_FR
fr-CH:
<<: *DEFAULT_FR
# Another locale
# --------------
+1 -1
View File
@@ -10,7 +10,7 @@
{% 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 }}
{{ words | divided_by:site.words_per_minute }} {{ site.data.ui-text[site.locale].minute_read }}
{% endif %}
{% else %}
{{ site.data.ui-text[site.locale].undefined_wpm }}
+6 -4
View File
@@ -85,6 +85,8 @@
{% if page.header.image %}
<meta property="og:image" content="{% if page.header.image contains "://" %}{{ page.header.image }}{% else %}{{ page.header.image | prepend: "/images/" | prepend: base_path }}{% endif %}">
{% elsif page.header.overlay_image %}
<meta property="og:image" content="{% if page.header.overlay_image contains "://" %}{{ page.header.overlay_image }}{% else %}{{ page.header.overlay_image | prepend: "/images/" | prepend: base_path }}{% endif %}">
{% endif %}
{% if page.date %}
@@ -113,7 +115,7 @@
<script type="application/ld+json">
{
"@context" : "http://schema.org",
"@type" : "{% if site.social.type %}{{ site.social.type }}{% else %}person{% endif %}",
"@type" : "{% if site.social.type %}{{ site.social.type }}{% else %}Person{% endif %}",
"name" : "{{ site.social.name | default: site.name }}",
"url" : {{ seo_url | jsonify }},
"sameAs" : {{ site.social.links | jsonify }}
@@ -127,10 +129,10 @@
{% if site.bing_site_verification %}
<meta name="msvalidate.01" content="{{ site.bing_site_verification }}">
{% endif %}
{% if site.owner.alexa.verify %}
{% if site.alexa_site_verification %}
<meta name="alexaVerifyID" content="{{ site.alexa_site_verification }}">
{% endif %}
{% if site.owner.yandex.verify %}
{% if site.yandex_site_verification %}
<meta name="yandex-verification" content="{{ site.yandex_site_verification }}">
{% endif %}
<!-- end SEO -->
<!-- end SEO -->
+1
View File
@@ -164,6 +164,7 @@
background: #fff;
z-index: -1;
box-shadow: 0 0 10px rgba(#000, 0.25);
cursor: default;
@include breakpoint($large) {
display: block;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "minimal-mistakes",
"version": "3.2.6",
"version": "3.2.9",
"description": "Minimal Mistakes Jekyll theme npm build scripts",
"repository": {
"type": "git",