Update to Jekyll 3.7.3

This commit is contained in:
Julien Deswaef 2018-04-29 17:41:09 +02:00
parent 30a2d89f3f
commit 04011c613c
23 changed files with 78 additions and 73 deletions

View File

@ -1,8 +1,8 @@
source 'https://rubygems.org'
gem 'jekyll', '~> 1.0'
gem 'jekyll', '~> 3.7'
gem 'safe_yaml', '~> 1.0.4'
gem 'sass', '~> 3.0'
gem 'libv8', '~> 3.16.14.0'
gem 'sass', '~> 3.5'
gem 'libv8', '~> 3.16.14.19'
gem 'therubyracer'
gem 'fontcustom'

View File

@ -1,53 +1,60 @@
GEM
remote: https://rubygems.org/
specs:
blankslate (2.1.2.4)
classifier (1.3.4)
fast-stemmer (>= 1.0.0)
colorator (0.1)
commander (4.1.6)
highline (~> 1.6.11)
fast-stemmer (1.0.2)
ffi (1.9.18)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
concurrent-ruby (1.0.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.5)
ffi (1.9.23)
fontcustom (2.0.0)
json (~> 1.4)
listen (>= 1.0, < 4.0)
thor (~> 0.14)
highline (1.6.21)
jekyll (1.5.1)
classifier (~> 1.3)
colorator (~> 0.1)
commander (~> 4.1.3)
liquid (~> 2.5.5)
listen (~> 1.3)
maruku (= 0.7.0)
pygments.rb (~> 0.5.0)
redcarpet (~> 2.3.0)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.7.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
json (1.8.3)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-watch (2.0.0)
listen (~> 3.0)
json (1.8.6)
kramdown (1.16.2)
libv8 (3.16.14.19)
liquid (2.5.5)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
maruku (0.7.0)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.13)
pygments.rb (0.5.4)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rb-fsevent (0.10.2)
liquid (4.0.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rb-kqueue (0.2.5)
ffi (>= 0.5.0)
redcarpet (2.3.0)
ref (2.0.0)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.5)
sass (3.5.6)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@ -56,19 +63,16 @@ GEM
libv8 (~> 3.16.14.15)
ref
thor (0.20.0)
toml (0.1.2)
parslet (~> 1.5.0)
yajl-ruby (1.1.0)
PLATFORMS
ruby
DEPENDENCIES
fontcustom
jekyll (~> 1.0)
libv8 (~> 3.16.14.0)
safe_yaml (~> 1.0.4)
sass (~> 3.0)
jekyll (>= 1.0)
libv8 (>= 3.16.14.0)
safe_yaml (>= 1.0.4)
sass (>= 3.0)
therubyracer
BUNDLED WITH

View File

@ -1,17 +1,15 @@
safe: false
port: 7998
baseurl: / # Where GitHub serves the project up from
url: http://localhost:7998
source: src/doc/
destination: _site
plugins: src/doc/_plugins
pygments: true
highlighter: rouge
permalink: pretty
# ensures SCSS files are compiled
include: [_*.scss]
# include: [_*.scss]
# used in building icon pages
icon_meta: src/icons/icons.yml

View File

@ -33,7 +33,7 @@
},
"scripts": {
"build": "bundle exec jekyll build",
"dev": "bundle exec jekyll -w serve",
"dev": "bundle exec jekyll serve -w",
"contributors:add": "all-contributors add",
"contributors:generate": "all-contributors generate"
},

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Accessibility Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_currency = icons | expand_aliases | category:"Accessibility Icons" | sort_by:'class' %}
{% assign icons_currency = icons | expand_aliases | where:"categories", "Accessibility Icons" | sort_by:'class' %}
{% for icon in icons_currency %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Brand Icons</h2>
<div class="row fontawesome-icon-list margin-bottom-lg">
{% assign icons_brand = icons | expand_aliases | category:"Brand Icons" | sort_by:'class' %}
{% assign icons_brand = icons | expand_aliases | where:"categories", "Brand Icons" | sort_by:'class' %}
{% for icon in icons_brand %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Chart Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_chart = icons | expand_aliases | category:"Chart Icons" | sort_by:'class' %}
{% assign icons_chart = icons | expand_aliases | where:"categories", "Chart Icons" | sort_by:'class' %}
{% for icon in icons_chart %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Currency Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_currency = icons | expand_aliases | category:"Currency Icons" | sort_by:'class' %}
{% assign icons_currency = icons | expand_aliases | where:"categories", "Currency Icons" | sort_by:'class' %}
{% for icon in icons_currency %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Directional Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_directional = icons | expand_aliases | category:"Directional Icons" | sort_by:'class' %}
{% assign icons_directional = icons | expand_aliases | where:"categories", "Directional Icons" | sort_by:'class' %}
{% for icon in icons_directional %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">File Type Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_file_type = icons | expand_aliases | category:"File Type Icons" | sort_by:'class' %}
{% assign icons_file_type = icons | expand_aliases | where:"categories", "File Type Icons" | sort_by:'class' %}
{% for icon in icons_file_type %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Form Control Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_form_control = icons | expand_aliases | category:"Form Control Icons" | sort_by:'class' %}
{% assign icons_form_control = icons | expand_aliases | where:"categories", "Form Control Icons" | sort_by:'class' %}
{% for icon in icons_form_control %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Gender Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_gender = icons | expand_aliases | category:"Gender Icons" | sort_by:'class' %}
{% assign icons_gender = icons | expand_aliases | where:"categories", "Gender Icons" | sort_by:'class' %}
{% for icon in icons_gender %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Hand Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_hand = icons | expand_aliases | category:"Hand Icons" | sort_by:'class' %}
{% assign icons_hand = icons | expand_aliases | where:"categories", "Hand Icons" | sort_by:'class' %}
{% for icon in icons_hand %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Medical Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_medical = icons | expand_aliases | category:"Medical Icons" | sort_by:'class' %}
{% assign icons_medical = icons | expand_aliases | where:"categories", "Medical Icons" | sort_by:'class' %}
{% for icon in icons_medical %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -1,5 +1,8 @@
<section id="new">
<h2 class="page-header">{{ icons | version:site.forkawesome.minor_version | size }} New Icons in {{ site.forkawesome.minor_version }}</h2>
{% assign icons_v1_0 = icons | version:1.0 %}
{% assign icons_v1 = icons | version:1.1 | concat: icons_v1_0 %}
<h2 class="page-header">{{ icons_v1 | size }} New Icons since {{ site.forkawesome.major_version }}.0.0</h2>
{% if page.navbar_active != "icons" %}
<div class="margin-botom-large">
You asked, {{ site.forkawesome.name }} delivers with {{ icons | version:site.forkawesome.minor_version | size }} shiny new icons in version {{ site.forkawesome.minor_version }}.
@ -8,7 +11,7 @@
{% endif %}
<div class="row fontawesome-icon-list">
{% assign icons_new = icons | expand_aliases | version:site.forkawesome.minor_version | sort_by:'class' %}
{% assign icons_new = icons | expand_aliases | version:1.0 | sort_by:'class' %}
{% for icon in icons_new %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Payment Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_payment = icons | expand_aliases | category:"Payment Icons" | sort_by:'class' %}
{% assign icons_payment = icons | expand_aliases | where:"categories", "Payment Icons" | sort_by:'class' %}
{% for icon in icons_payment %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -13,7 +13,7 @@
</div>
<div class="row fontawesome-icon-list">
{% assign icons_spinner = icons | expand_aliases | category:"Spinner Icons" | sort_by:'class' %}
{% assign icons_spinner = icons | expand_aliases | where:"categories", "Spinner Icons" | sort_by:'class' %}
{% for icon in icons_spinner %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Text Editor Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_text_editor = icons | expand_aliases | category:"Text Editor Icons" | sort_by:'class' %}
{% assign icons_text_editor = icons | expand_aliases | where:"categories", "Text Editor Icons" | sort_by:'class' %}
{% for icon in icons_text_editor %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Transportation Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_transportation = icons | expand_aliases | category:"Transportation Icons" | sort_by:'class' %}
{% assign icons_transportation = icons | expand_aliases | where:"categories", "Transportation Icons" | sort_by:'class' %}
{% for icon in icons_transportation %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Video Player Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_video_player = icons | expand_aliases | category:"Video Player Icons" | sort_by:'class' %}
{% assign icons_video_player = icons | expand_aliases | where:"categories", "Video Player Icons" | sort_by:'class' %}
{% for icon in icons_video_player %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -2,7 +2,7 @@
<h2 class="page-header">Web Application Icons</h2>
<div class="row fontawesome-icon-list">
{% assign icons_web_application = icons | expand_aliases | category:"Web Application Icons" | sort_by:'class' %}
{% assign icons_web_application = icons | expand_aliases | where:"categories", "Web Application Icons" | sort_by:'class' %}
{% for icon in icons_web_application %}
<div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

View File

@ -19,8 +19,8 @@ module Jekyll
self.process(@name)
self.read_yaml(File.join(base, site.config['layouts']), site.config['icon_layout'])
self.read_yaml(File.join(base, site.config['layouts_dir']), site.config['icon_layout'])
self.data['icon'] = icon
self.data['title'] = "fa-#{icon.id}: " + self.data['title_suffix']
end

View File

@ -128,7 +128,7 @@ module Jekyll
{
"site" => self.config.merge({
"time" => self.time,
"posts" => self.posts.sort { |a, b| b <=> a },
"posts" => self.posts.docs.sort { |a, b| b <=> a },
"pages" => self.pages,
"html_pages" => self.pages.reject { |page| !page.html? },
"categories" => post_attr_hash('categories'),