From cd019f496ce7309cffc9577fd4dcafd7880a3b4f Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 13 Jun 2016 10:25:15 -0400 Subject: [PATCH 1/4] Remove `minutes_read` to avoid awkward reading time wording - Issue #356 --- _data/ui-text.yml | 3 --- _includes/read-time.html | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/_data/ui-text.yml b/_data/ui-text.yml index 5d634fd6..43c2c835 100644 --- a/_data/ui-text.yml +++ b/_data/ui-text.yml @@ -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:" @@ -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:" @@ -78,7 +76,6 @@ fr: &DEFAULT_FR ext_link_label : "Lien direct" less_than : "plus petit que" minute_read : "minute de lecture" - minutes_read : "minutes de lecture" share_on_label : "Partager sur" meta_label : tags_label : "Tags :" diff --git a/_includes/read-time.html b/_includes/read-time.html index 272bd4e5..605dc0bc 100644 --- a/_includes/read-time.html +++ b/_includes/read-time.html @@ -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 }} From 66553093d655de62e30deb7277a5280157b37c7f Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Mon, 13 Jun 2016 10:44:58 -0400 Subject: [PATCH 2/4] Update `github-pages` gem and dependencies --- Gemfile.lock | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 244b0300..6077896b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) From beaaa884ff6180ab8c75e7d606e9f7d034657726 Mon Sep 17 00:00:00 2001 From: Josh Habdas Date: Sun, 12 Jun 2016 14:35:22 -0500 Subject: [PATCH 3/4] Use header overlay images for Open Graph image --- _includes/seo.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/seo.html b/_includes/seo.html index 0298f6ce..47c190e9 100644 --- a/_includes/seo.html +++ b/_includes/seo.html @@ -85,6 +85,8 @@ {% if page.header.image %} +{% elsif page.header.overlay_image %} + {% endif %} {% if page.date %} @@ -113,7 +115,7 @@