Merge branch 'master' of https://github.com/mmistakes/jekyll-theme-ba…

…sically-basic
mmistakes · Sep 5, 2017 · 3bc7434 · 3bc7434
2 parents 8b69401 + 1c571db
commit 3bc7434
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git 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)
 
 ### Added
 ### Changed

diff --git 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
@@ -17,11 +17,11 @@
   {% endif %}
 
   <li>
-    {% if site.gems contains 'jekyll-feed' %}
+    {% if site.plugins contains 'jekyll-feed' %}
       <a href="{{ site.feed.path | default: 'feed.xml' | relative_url }}" title="Atom Feed">
         <span class="icon icon--rss">{% include icon-rss.svg %}</span>
         <span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>
       </a>
     {% endif %}
   </li>
-</ul>
+</ul>
diff --git a/_layouts/home.html b/_layouts/home.html
@@ -13,7 +13,7 @@
         <h2>{{ 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 %}</h2>
       </header>
       <div class="entries">
-        {% 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
@@ -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
@@ -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
@@ -17,11 +17,11 @@
   {% endif %}
 
   <li>
-    {% if site.gems contains 'jekyll-feed' %}
+    {% if site.plugins contains 'jekyll-feed' %}
       <a href="{{ site.feed.path | default: 'feed.xml' | relative_url }}" title="Atom Feed">
         <span class="icon icon--rss">{% include icon-rss.svg %}</span>
         <span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>
       </a>
     {% endif %}
   </li>
-</ul>
+</ul>
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
@@ -13,7 +13,7 @@
         <h2>{{ 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 %}</h2>
       </header>
       <div class="entries">
-        {% 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
@@ -34,7 +34,7 @@ liquid:
 # Build settings
 markdown: kramdown
 theme: jekyll-theme-basically-basic
-gems:
+plugins:
   - jekyll-feed
   - jekyll-seo-tag
   - jekyll-sitemap