From 25803e373167da4280cc1187596c6b8951fb1fa9 Mon Sep 17 00:00:00 2001 From: Ujjwal Sharma Date: Tue, 8 Aug 2017 19:50:28 +0000 Subject: [PATCH 1/4] Rename gems key to plugins (#23) --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index fa1f76c..019b2ea 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,7 @@ logo: # path of site logo, e.g. "/assets/images/logo.png" # Build settings markdown: kramdown theme: jekyll-theme-basically-basic -gems: +plugins: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap From 7b238fe6f8f4808244e255e693eb24acb1a9466a Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 8 Aug 2017 15:51:04 -0400 Subject: [PATCH 2/4] Rename gems key to plugins --- docs/_config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_config.yml b/docs/_config.yml index adc7952..46d1735 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -51,7 +51,7 @@ permalink: /:categories/:title/ timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones # Plugins -gems: +plugins: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap From 428b2b03100cad79bf53b78d89db60f5b9e4b4c3 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 8 Aug 2017 20:06:35 -0400 Subject: [PATCH 3/4] Roll back `gems:` to `plugins:` change in `_config.yml` - GitHub Pages still doesn't seem to load safe plugins when using `plugins` key --- _config.yml | 2 +- docs/_config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 019b2ea..fa1f76c 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,7 @@ logo: # path of site logo, e.g. "/assets/images/logo.png" # Build settings markdown: kramdown theme: jekyll-theme-basically-basic -plugins: +gems: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap diff --git a/docs/_config.yml b/docs/_config.yml index 46d1735..adc7952 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -51,7 +51,7 @@ permalink: /:categories/:title/ timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones # Plugins -plugins: +gems: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap From 1c571dbf6c62bd911f629511cce90f3acfae4cd1 Mon Sep 17 00:00:00 2001 From: Michael Rose Date: Tue, 8 Aug 2017 20:36:05 -0400 Subject: [PATCH 4/4] Revert back `plugins: ` and update references to `site.gems` with `site.plugins` - Conditionals that determine if jekyll-paginate and jekyll-feed are active weren't working due `gems` key change in Jekyll 3.5 ref #24 --- CHANGELOG.md | 2 ++ _config.yml | 2 +- _includes/contact-list.html | 4 ++-- _layouts/home.html | 2 +- docs/Gemfile | 10 +++++----- docs/_config.yml | 2 +- docs/_includes/contact-list.html | 4 ++-- docs/_layouts/home.html | 2 +- example/_config.yml | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 661e407..974da88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +### Changed +- Change `gems` key in `_config.yml` to `plugins`. [#23](https://github.com/mmistakes/jekyll-theme-basically-basic/pull/23) ## [1.1.0] - 2017-03-30 ### Added diff --git a/_config.yml b/_config.yml index fa1f76c..019b2ea 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,7 @@ logo: # path of site logo, e.g. "/assets/images/logo.png" # Build settings markdown: kramdown theme: jekyll-theme-basically-basic -gems: +plugins: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap diff --git a/_includes/contact-list.html b/_includes/contact-list.html index b5697e3..d406d8d 100644 --- a/_includes/contact-list.html +++ b/_includes/contact-list.html @@ -17,11 +17,11 @@ {% endif %}
  • - {% if site.gems contains 'jekyll-feed' %} + {% if site.plugins contains 'jekyll-feed' %} {% include icon-rss.svg %} {{ site.data.theme.t.subscribe | default: 'Subscribe' }} {% endif %}
    • - \ No newline at end of file + diff --git a/_layouts/home.html b/_layouts/home.html index f8a2b90..213f878 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -13,7 +13,7 @@ layout: default

    {{ site.data.theme.t.posts | default: 'Posts' }}{% if paginator.page > 1 %}{{ site.data.theme.t.page | default: 'Page' | prepend: ' - ' | append: ' ' }}{{ paginator.page }} {{ site.data.theme.t.of | default: 'of' }} {{ paginator.total_pages }}{% endif %}

    - {% if site.gems contains 'jekyll-paginate' and page.paginate %} + {% if site.plugins contains 'jekyll-paginate' and page.paginate %} {% comment %} Add paginator.posts loop if jekyll-paginate plugin is enabled and page.paginate == true diff --git a/docs/Gemfile b/docs/Gemfile index ecbd3fe..148049d 100644 --- a/docs/Gemfile +++ b/docs/Gemfile @@ -6,9 +6,9 @@ gem "wdm", "~> 0.1.0" if Gem.win_platform? # If you have any plugins, put them here! # group :jekyll_plugins do - # gem "jekyll-paginate" - # gem "jekyll-sitemap" - # gem "jekyll-gist" - # gem "jekyll-feed" - # gem "jemoji" +# gem "jekyll-paginate" +# gem "jekyll-sitemap" +# gem "jekyll-gist" +# gem "jekyll-feed" +# gem "jemoji" # end diff --git a/docs/_config.yml b/docs/_config.yml index adc7952..46d1735 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -51,7 +51,7 @@ permalink: /:categories/:title/ timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones # Plugins -gems: +plugins: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap diff --git a/docs/_includes/contact-list.html b/docs/_includes/contact-list.html index b5697e3..d406d8d 100644 --- a/docs/_includes/contact-list.html +++ b/docs/_includes/contact-list.html @@ -17,11 +17,11 @@ {% endif %}
  • - {% if site.gems contains 'jekyll-feed' %} + {% if site.plugins contains 'jekyll-feed' %} {% include icon-rss.svg %} {{ site.data.theme.t.subscribe | default: 'Subscribe' }} {% endif %}
    • - \ No newline at end of file + diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html index f8a2b90..213f878 100644 --- a/docs/_layouts/home.html +++ b/docs/_layouts/home.html @@ -13,7 +13,7 @@ layout: default

    {{ site.data.theme.t.posts | default: 'Posts' }}{% if paginator.page > 1 %}{{ site.data.theme.t.page | default: 'Page' | prepend: ' - ' | append: ' ' }}{{ paginator.page }} {{ site.data.theme.t.of | default: 'of' }} {{ paginator.total_pages }}{% endif %}

    - {% if site.gems contains 'jekyll-paginate' and page.paginate %} + {% if site.plugins contains 'jekyll-paginate' and page.paginate %} {% comment %} Add paginator.posts loop if jekyll-paginate plugin is enabled and page.paginate == true diff --git a/example/_config.yml b/example/_config.yml index 7a7279a..307785a 100644 --- a/example/_config.yml +++ b/example/_config.yml @@ -30,7 +30,7 @@ logo: /assets/icons/basically-basic-logo-light.svg # Build settings markdown: kramdown theme: jekyll-theme-basically-basic -gems: +plugins: - jekyll-feed - jekyll-seo-tag - jekyll-sitemap