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
This commit is contained in:
parent
428b2b0310
commit
1c571dbf6c
|
@ -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/).
|
and this project adheres to [Semantic Versioning](http://semver.org/).
|
||||||
|
|
||||||
## [Unreleased]
|
## [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
|
## [1.1.0] - 2017-03-30
|
||||||
### Added
|
### Added
|
||||||
|
|
|
@ -30,7 +30,7 @@ logo: # path of site logo, e.g. "/assets/images/logo.png"
|
||||||
# Build settings
|
# Build settings
|
||||||
markdown: kramdown
|
markdown: kramdown
|
||||||
theme: jekyll-theme-basically-basic
|
theme: jekyll-theme-basically-basic
|
||||||
gems:
|
plugins:
|
||||||
- jekyll-feed
|
- jekyll-feed
|
||||||
- jekyll-seo-tag
|
- jekyll-seo-tag
|
||||||
- jekyll-sitemap
|
- jekyll-sitemap
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<li>
|
<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">
|
<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="icon icon--rss">{% include icon-rss.svg %}</span>
|
||||||
<span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>
|
<span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -13,7 +13,7 @@ layout: default
|
||||||
<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>
|
<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>
|
</header>
|
||||||
<div class="entries">
|
<div class="entries">
|
||||||
{% if site.gems contains 'jekyll-paginate' and page.paginate %}
|
{% if site.plugins contains 'jekyll-paginate' and page.paginate %}
|
||||||
{% comment %}
|
{% comment %}
|
||||||
Add paginator.posts loop if jekyll-paginate plugin is enabled
|
Add paginator.posts loop if jekyll-paginate plugin is enabled
|
||||||
and page.paginate == true
|
and page.paginate == true
|
||||||
|
|
10
docs/Gemfile
10
docs/Gemfile
|
@ -6,9 +6,9 @@ gem "wdm", "~> 0.1.0" if Gem.win_platform?
|
||||||
|
|
||||||
# If you have any plugins, put them here!
|
# If you have any plugins, put them here!
|
||||||
# group :jekyll_plugins do
|
# group :jekyll_plugins do
|
||||||
# gem "jekyll-paginate"
|
# gem "jekyll-paginate"
|
||||||
# gem "jekyll-sitemap"
|
# gem "jekyll-sitemap"
|
||||||
# gem "jekyll-gist"
|
# gem "jekyll-gist"
|
||||||
# gem "jekyll-feed"
|
# gem "jekyll-feed"
|
||||||
# gem "jemoji"
|
# gem "jemoji"
|
||||||
# end
|
# end
|
||||||
|
|
|
@ -51,7 +51,7 @@ permalink: /:categories/:title/
|
||||||
timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
timezone: America/New_York # http://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
gems:
|
plugins:
|
||||||
- jekyll-feed
|
- jekyll-feed
|
||||||
- jekyll-seo-tag
|
- jekyll-seo-tag
|
||||||
- jekyll-sitemap
|
- jekyll-sitemap
|
||||||
|
|
|
@ -17,11 +17,11 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
<li>
|
<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">
|
<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="icon icon--rss">{% include icon-rss.svg %}</span>
|
||||||
<span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>
|
<span class="label">{{ site.data.theme.t.subscribe | default: 'Subscribe' }}</span>
|
||||||
</a>
|
</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -13,7 +13,7 @@ layout: default
|
||||||
<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>
|
<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>
|
</header>
|
||||||
<div class="entries">
|
<div class="entries">
|
||||||
{% if site.gems contains 'jekyll-paginate' and page.paginate %}
|
{% if site.plugins contains 'jekyll-paginate' and page.paginate %}
|
||||||
{% comment %}
|
{% comment %}
|
||||||
Add paginator.posts loop if jekyll-paginate plugin is enabled
|
Add paginator.posts loop if jekyll-paginate plugin is enabled
|
||||||
and page.paginate == true
|
and page.paginate == true
|
||||||
|
|
|
@ -30,7 +30,7 @@ logo: /assets/icons/basically-basic-logo-light.svg
|
||||||
# Build settings
|
# Build settings
|
||||||
markdown: kramdown
|
markdown: kramdown
|
||||||
theme: jekyll-theme-basically-basic
|
theme: jekyll-theme-basically-basic
|
||||||
gems:
|
plugins:
|
||||||
- jekyll-feed
|
- jekyll-feed
|
||||||
- jekyll-seo-tag
|
- jekyll-seo-tag
|
||||||
- jekyll-sitemap
|
- jekyll-sitemap
|
||||||
|
|
Loading…
Reference in New Issue