Update to Jekyll 3.7.3

19 files changed, 24 insertions, 21 deletions

diff --git a/src/doc/_includes/icons/accessibility.html b/src/doc/_includes/icons/accessibility.html
index 14cd92e5c..c9f6202db 100644
--- a/src/doc/_includes/icons/accessibility.html
+++ b/src/doc/_includes/icons/accessibility.html
@@ -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>
diff --git a/src/doc/_includes/icons/brand.html b/src/doc/_includes/icons/brand.html
index 3243bc83e..6a740d6a9 100644
--- a/src/doc/_includes/icons/brand.html
+++ b/src/doc/_includes/icons/brand.html
@@ -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>
diff --git a/src/doc/_includes/icons/chart.html b/src/doc/_includes/icons/chart.html
index f5cbc1cca..e0be4abee 100644
--- a/src/doc/_includes/icons/chart.html
+++ b/src/doc/_includes/icons/chart.html
@@ -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>
diff --git a/src/doc/_includes/icons/currency.html b/src/doc/_includes/icons/currency.html
index bc9061513..b8de574fd 100644
--- a/src/doc/_includes/icons/currency.html
+++ b/src/doc/_includes/icons/currency.html
@@ -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>
diff --git a/src/doc/_includes/icons/directional.html b/src/doc/_includes/icons/directional.html
index d8f2a4c0e..3257dcc5d 100644
--- a/src/doc/_includes/icons/directional.html
+++ b/src/doc/_includes/icons/directional.html
@@ -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>
diff --git a/src/doc/_includes/icons/file-type.html b/src/doc/_includes/icons/file-type.html
index 290022be1..b1713bfff 100644
--- a/src/doc/_includes/icons/file-type.html
+++ b/src/doc/_includes/icons/file-type.html
@@ -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>
diff --git a/src/doc/_includes/icons/form-control.html b/src/doc/_includes/icons/form-control.html
index a8cac628a..dd43d908f 100644
--- a/src/doc/_includes/icons/form-control.html
+++ b/src/doc/_includes/icons/form-control.html
@@ -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>
diff --git a/src/doc/_includes/icons/gender.html b/src/doc/_includes/icons/gender.html
index 1fbde026b..091cdffb8 100644
--- a/src/doc/_includes/icons/gender.html
+++ b/src/doc/_includes/icons/gender.html
@@ -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>
diff --git a/src/doc/_includes/icons/hand.html b/src/doc/_includes/icons/hand.html
index 4104af2e0..3f21f916f 100644
--- a/src/doc/_includes/icons/hand.html
+++ b/src/doc/_includes/icons/hand.html
@@ -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>
diff --git a/src/doc/_includes/icons/medical.html b/src/doc/_includes/icons/medical.html
index 23364382a..e27ca3389 100644
--- a/src/doc/_includes/icons/medical.html
+++ b/src/doc/_includes/icons/medical.html
@@ -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>
diff --git a/src/doc/_includes/icons/new.html b/src/doc/_includes/icons/new.html
index 4da9776d3..eecd9e177 100644
--- a/src/doc/_includes/icons/new.html
+++ b/src/doc/_includes/icons/new.html
@@ -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>
diff --git a/src/doc/_includes/icons/payment.html b/src/doc/_includes/icons/payment.html
index 03a636465..051cf504e 100644
--- a/src/doc/_includes/icons/payment.html
+++ b/src/doc/_includes/icons/payment.html
@@ -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>
diff --git a/src/doc/_includes/icons/spinner.html b/src/doc/_includes/icons/spinner.html
index ef9d68e8b..c4bca75c8 100644
--- a/src/doc/_includes/icons/spinner.html
+++ b/src/doc/_includes/icons/spinner.html
@@ -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>
diff --git a/src/doc/_includes/icons/text-editor.html b/src/doc/_includes/icons/text-editor.html
index 05d33cb2b..20ac360e4 100644
--- a/src/doc/_includes/icons/text-editor.html
+++ b/src/doc/_includes/icons/text-editor.html
@@ -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>
diff --git a/src/doc/_includes/icons/transportation.html b/src/doc/_includes/icons/transportation.html
index af2fd7e7f..bf67ee496 100644
--- a/src/doc/_includes/icons/transportation.html
+++ b/src/doc/_includes/icons/transportation.html
@@ -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>
diff --git a/src/doc/_includes/icons/video-player.html b/src/doc/_includes/icons/video-player.html
index 4a57612d1..cb39c031a 100644
--- a/src/doc/_includes/icons/video-player.html
+++ b/src/doc/_includes/icons/video-player.html
@@ -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>
diff --git a/src/doc/_includes/icons/web-application.html b/src/doc/_includes/icons/web-application.html
index 6e737e6cd..453b8757b 100644
--- a/src/doc/_includes/icons/web-application.html
+++ b/src/doc/_includes/icons/web-application.html
@@ -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>
diff --git a/src/doc/_plugins/icon_page_generator.rb b/src/doc/_plugins/icon_page_generator.rb
index 32b7cd428..0daadf3ef 100644
--- a/src/doc/_plugins/icon_page_generator.rb
+++ b/src/doc/_plugins/icon_page_generator.rb
@@ -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
diff --git a/src/doc/_plugins/site.rb b/src/doc/_plugins/site.rb
index a6a74b7bb..0784d0dd6 100644
--- a/src/doc/_plugins/site.rb
+++ b/src/doc/_plugins/site.rb
@@ -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'),