From 08ac020ce55a69e50769f231801c851421f717ea Mon Sep 17 00:00:00 2001
From: xdavidwu <xdavidwuph@gmail.com>
Date: Sun, 6 Feb 2022 17:26:01 +0800
Subject: [PATCH] fa: fav4-ify

---
 _includes/archive-single.html                  | 2 +-
 _includes/author-profile.html                  | 2 +-
 _includes/comments-providers/staticman.html    | 2 +-
 _includes/comments-providers/staticman_v2.html | 2 +-
 _includes/comments.html                        | 4 ++--
 _includes/footer.html                          | 2 +-
 _includes/head.html                            | 1 -
 _includes/page__meta.html                      | 4 ++--
 _includes/toc                                  | 2 +-
 _layouts/single.html                           | 4 ++--
 _plugins/anchor.rb                             | 2 +-
 _sass/minimal-mistakes/_colors.scss            | 5 +----
 12 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/_includes/archive-single.html b/_includes/archive-single.html
index 969f1f1..e399ea5 100644
--- a/_includes/archive-single.html
+++ b/_includes/archive-single.html
@@ -25,7 +25,7 @@
     {% endif %}
     <h2 class="archive__item-title no_toc" itemprop="headline">
       {% if post.link %}
-        <a href="{{ post.link }}">{{ title }}</a> <a href="{{ post.url | relative_url }}" rel="permalink"><i class="fas fa-link" aria-hidden="true" title="permalink"></i><span class="sr-only">Permalink</span></a>
+        <a href="{{ post.link }}">{{ title }}</a> <a href="{{ post.url | relative_url }}" rel="permalink"><i class="fa fa-fw fa-link" aria-hidden="true" title="permalink"></i><span class="sr-only">Permalink</span></a>
       {% else %}
         <a href="{{ post.url | relative_url }}" rel="permalink">{{ title }}</a>
       {% endif %}
diff --git a/_includes/author-profile.html b/_includes/author-profile.html
index 55e263f..a8356e4 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile.html
@@ -41,7 +41,7 @@
       {% if author.links %}
         {% for link in author.links %}
           {% if link.label and link.url %}
-            <li><a href="{{ link.url }}" rel="nofollow noopener noreferrer"><i class="{{ link.icon | default: 'fas fa-link' }}" aria-hidden="true"></i><span class="label">{{ link.label }}</span></a></li>
+            <li><a href="{{ link.url }}" rel="nofollow noopener noreferrer"><i class="{{ link.icon | default: 'fa fa-fw fa-link' }}" aria-hidden="true"></i><span class="label">{{ link.label }}</span></a></li>
           {% endif %}
         {% endfor %}
       {% endif %}
diff --git a/_includes/comments-providers/staticman.html b/_includes/comments-providers/staticman.html
index ae3991d..c83fea6 100644
--- a/_includes/comments-providers/staticman.html
+++ b/_includes/comments-providers/staticman.html
@@ -5,7 +5,7 @@
       var form = this;
 
       $(form).addClass('disabled');
-      $('#comment-form-submit').html('<i class="fas fa-spinner fa-spin fa-fw"></i> {{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}');
+      $('#comment-form-submit').html('<i class="fa fa-spinner fa-spin fa-fw"></i> {{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}');
 
       $.ajax({
         type: $(this).attr('method'),
diff --git a/_includes/comments-providers/staticman_v2.html b/_includes/comments-providers/staticman_v2.html
index 3d8ba11..1969423 100644
--- a/_includes/comments-providers/staticman_v2.html
+++ b/_includes/comments-providers/staticman_v2.html
@@ -5,7 +5,7 @@
       var form = this;
 
       $(form).addClass('disabled');
-      $('#comment-form-submit').html('<i class="fas fa-spinner fa-spin fa-fw"></i> {{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}');
+      $('#comment-form-submit').html('<i class="fa fa-spinner fa-spin fa-fw"></i> {{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}');
 
       $.ajax({
         type: $(this).attr('method'),
diff --git a/_includes/comments.html b/_includes/comments.html
index d2695c9..127e582 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -39,7 +39,7 @@
             <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
             <form id="new_comment" class="page__comments-form js-form form" method="post" action="{{ site.comments.staticman.endpoint | default: 'https://api.staticman.net/v2/entry/' }}{{ site.repository }}/{{ site.comments.staticman.branch }}/comments">
               <div class="form__spinner">
-                <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
+                <i class="fa fa-spinner fa-spin fa-3x fa-fw"></i>
                 <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
               </div>
 
@@ -113,7 +113,7 @@
             <p class="small">{{ site.data.ui-text[site.locale].comment_form_info | default: "Your email address will not be published. Required fields are marked" }} <span class="required">*</span></p>
             <form id="new_comment" class="page__comments-form js-form form" method="post" action="https://api.staticman.net/v1/entry/{{ site.repository }}/{{ site.staticman.branch }}">
               <div class="form__spinner">
-                <i class="fas fa-spinner fa-spin fa-3x fa-fw"></i>
+                <i class="fa fa-spinner fa-spin fa-3x fa-fw"></i>
                 <span class="sr-only">{{ site.data.ui-text[site.locale].loading_label | default: "Loading..." }}</span>
               </div>
 
diff --git a/_includes/footer.html b/_includes/footer.html
index b39e979..532a17e 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -3,7 +3,7 @@
     {% if site.footer.links %}
       {% for link in site.footer.links %}
         {% if link.label and link.url %}
-          <li><a href="{{ link.url }}" rel="nofollow noopener noreferrer"><i class="{{ link.icon | default: 'fas fa-link' }}" aria-hidden="true"></i>{{ link.label }}</a></li>
+          <li><a href="{{ link.url }}" rel="nofollow noopener noreferrer"><i class="{{ link.icon | default: 'fa fa-fw fa-link' }}" aria-hidden="true"></i>{{ link.label }}</a></li>
         {% endif %}
       {% endfor %}
     {% endif %}
diff --git a/_includes/head.html b/_includes/head.html
index 2bec68b..6269a05 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -13,4 +13,3 @@
 {% endif %}
 <link rel="stylesheet" href="{{ '/assets/css/main.css' | relative_url }}">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/fork-awesome.min.css" integrity="sha256-gsmEoJAws/Kd3CjuOQzLie5Q3yshhvmo7YNtBG7aaEY=" crossorigin="anonymous">
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.1.7/css/v5-compat.min.css" integrity="sha384-1zW94WHdRLtWmM3xxKcAULg/IDeSsb7kofYSkI2jlXTRLO9UXrZcxB1Xi7jQ18Fg" crossorigin="anonymous">
diff --git a/_includes/page__meta.html b/_includes/page__meta.html
index ab6f850..c5c7d30 100644
--- a/_includes/page__meta.html
+++ b/_includes/page__meta.html
@@ -4,7 +4,7 @@
     {% if document.show_date and document.date %}
       {% assign date = document.date %}
       <span class="page__meta-date">
-        <i class="far fa-fw fa-calendar-alt" aria-hidden="true"></i>
+        <i class="fa fa-fw fa-calendar" aria-hidden="true"></i>
         <time datetime="{{ date | date_to_xmlschema }}">{{ date | date: "%B %-d, %Y" }}</time>
       </span>
     {% endif %}
@@ -16,7 +16,7 @@
       {% assign words = document.content | strip_html | number_of_words %}
 
       <span class="page__meta-readtime">
-        <i class="far fa-fw fa-clock" aria-hidden="true"></i>
+        <i class="fa fa-fw fa-clock-o" aria-hidden="true"></i>
         {% if words < words_per_minute %}
           {{ site.data.ui-text[site.locale].less_than | default: "less than" }} 1 {{ site.data.ui-text[site.locale].minute_read | default: "minute read" }}
         {% elsif words == words_per_minute %}
diff --git a/_includes/toc b/_includes/toc
index 6423ccd..6304216 100644
--- a/_includes/toc
+++ b/_includes/toc
@@ -1,6 +1,6 @@
 <aside class="sidebar__right">
 <nav class="toc" markdown="1">
-<header><h4 class="nav__title"><i class="fas fa-{{ include.icon | default: 'file-alt' }}"></i> {{ include.title | default: site.data.ui-text[site.locale].toc_label }}</h4></header>
+<header><h4 class="nav__title"><i class="fa fa-file-text-o"></i> {{ include.title | default: site.data.ui-text[site.locale].toc_label }}</h4></header>
 *  Auto generated table of contents
 {:toc .toc__menu}
 </nav>
diff --git a/_layouts/single.html b/_layouts/single.html
index 6da3e1f..7483687 100644
--- a/_layouts/single.html
+++ b/_layouts/single.html
@@ -35,7 +35,7 @@ layout: default
         {% if page.toc %}
           <aside class="sidebar__right {% if page.toc_sticky %}sticky{% endif %}">
             <nav class="toc">
-              <header><h4 class="nav__title"><i class="fas fa-{{ page.toc_icon | default: 'file-alt' }}"></i> {{ page.toc_label | default: site.data.ui-text[site.locale].toc_label | default: "On this page" }}</h4></header>
+              <header><h4 class="nav__title"><i class="fa fa-file-text-o"></i> {{ page.toc_label | default: site.data.ui-text[site.locale].toc_label | default: "On this page" }}</h4></header>
               {% include toc.html sanitize=true html=content h_min=1 h_max=6 class="toc__menu" %}
             </nav>
           </aside>
@@ -59,7 +59,7 @@ layout: default
       {% if jekyll.environment == 'production' and site.comments.provider and page.comments %}
         {% include comments.html %}
       {% endif %}
-  
+
       {% comment %}<!-- only show related on a post page when `related: true` -->{% endcomment %}
       {% if page.id and page.related and site.related_posts.size > 0 %}
         <div class="page__related">
diff --git a/_plugins/anchor.rb b/_plugins/anchor.rb
index 93779a4..d5c1080 100644
--- a/_plugins/anchor.rb
+++ b/_plugins/anchor.rb
@@ -1,5 +1,5 @@
 class Jekyll::MarkdownHeader < Jekyll::Converters::Markdown
     def convert(content)
-        super.gsub(/<h(\d) id="(.*?)">(.*)<\/h(\d)>/, '<h\1 id="\2">\3<a class="header-link" href="#\2"><span class="sr-only">Permalink</span><i class="fas fa-link"></i></a></h\1>')
+        super.gsub(/<h(\d) id="(.*?)">(.*)<\/h(\d)>/, '<h\1 id="\2">\3<a class="header-link" href="#\2"><span class="sr-only">Permalink</span><i class="fa fa-fw fa-link"></i></a></h\1>')
     end
 end
diff --git a/_sass/minimal-mistakes/_colors.scss b/_sass/minimal-mistakes/_colors.scss
index d96090a..f160a33 100644
--- a/_sass/minimal-mistakes/_colors.scss
+++ b/_sass/minimal-mistakes/_colors.scss
@@ -414,10 +414,7 @@ td {
 }
 
 .social-icons {
-  .fas,
-  .fab,
-  .far,
-  .fal {
+  .fa {
     color: $text-color;
   }
 /*
-- 
2.43.0