Another attempt at updating FontAwesome to version 5

src/renderer/html_handlebars/hbs_renderer.rs

@@ -218,40 +218,86 @@ impl HtmlHandlebars {
         write_file(destination, "ayu-highlight.css", &theme.ayu_highlight_css)?;
         write_file(destination, "highlight.js", &theme.highlight_js)?;
         write_file(destination, "clipboard.min.js", &theme.clipboard_js)?;
+        write_file(destination, "FontAwesome/css/all.css", theme::FONT_AWESOME)?;
         write_file(
             destination,
-            "FontAwesome/css/font-awesome.css",
-            theme::FONT_AWESOME,
+            "FontAwesome/css/v4-shims.css",
+            theme::FONT_AWESOME_V4_SHIMS,
         )?;
         write_file(
             destination,
-            "FontAwesome/fonts/fontawesome-webfont.eot",
-            theme::FONT_AWESOME_EOT,
+            "FontAwesome/webfonts/fa-regular-400.eot",
+            theme::FONT_AWESOME_REGULAR_EOT,
         )?;
         write_file(
             destination,
-            "FontAwesome/fonts/fontawesome-webfont.svg",
-            theme::FONT_AWESOME_SVG,
+            "FontAwesome/webfonts/fa-regular-400.svg",
+            theme::FONT_AWESOME_REGULAR_SVG,
         )?;
         write_file(
             destination,
-            "FontAwesome/fonts/fontawesome-webfont.ttf",
-            theme::FONT_AWESOME_TTF,
+            "FontAwesome/webfonts/fa-regular-400.ttf",
+            theme::FONT_AWESOME_REGULAR_TTF,
         )?;
         write_file(
             destination,
-            "FontAwesome/fonts/fontawesome-webfont.woff",
-            theme::FONT_AWESOME_WOFF,
+            "FontAwesome/webfonts/fa-regular-400.woff",
+            theme::FONT_AWESOME_REGULAR_WOFF,
         )?;
         write_file(
             destination,
-            "FontAwesome/fonts/fontawesome-webfont.woff2",
-            theme::FONT_AWESOME_WOFF2,
+            "FontAwesome/webfonts/fa-regular-400.woff2",
+            theme::FONT_AWESOME_REGULAR_WOFF2,
         )?;
         write_file(
             destination,
-            "FontAwesome/fonts/FontAwesome.ttf",
-            theme::FONT_AWESOME_TTF,
+            "FontAwesome/webfonts/fa-brands-400.eot",
+            theme::FONT_AWESOME_BRANDS_EOT,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-brands-400.svg",
+            theme::FONT_AWESOME_BRANDS_SVG,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-brands-400.ttf",
+            theme::FONT_AWESOME_BRANDS_TTF,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-brands-400.woff",
+            theme::FONT_AWESOME_BRANDS_WOFF,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-brands-400.woff2",
+            theme::FONT_AWESOME_BRANDS_WOFF2,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-solid-900.eot",
+            theme::FONT_AWESOME_SOLID_EOT,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-solid-900.svg",
+            theme::FONT_AWESOME_SOLID_SVG,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-solid-900.ttf",
+            theme::FONT_AWESOME_SOLID_TTF,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-solid-900.woff",
+            theme::FONT_AWESOME_SOLID_WOFF,
+        )?;
+        write_file(
+            destination,
+            "FontAwesome/webfonts/fa-solid-900.woff2",
+            theme::FONT_AWESOME_SOLID_WOFF2,
         )?;
         if html_config.copy_fonts {
             write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?;

src/theme/index.hbs

@@ -33,8 +33,11 @@
         <link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
         {{/if}}
 
+        <!-- Font Awesome 5.13 free content -->
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/all.css">
+        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/v4-shims.css">
+
         <!-- Fonts -->
-        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
         {{#if copy_fonts}}
         <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
         {{/if}}
@@ -119,7 +122,7 @@
                             <i class="fa fa-bars"></i>
                         </button>
                         <button id="theme-toggle" class="icon-button" type="button" title="Change theme" aria-label="Change theme" aria-haspopup="true" aria-expanded="false" aria-controls="theme-list">
-                            <i class="fa fa-paint-brush"></i>
+                            <i class="fa fa-palette"></i>
                         </button>
                         <ul id="theme-list" class="theme-popup" aria-label="Themes" role="menu">
                             <li role="none"><button role="menuitem" class="theme" id="light">{{ theme_option "Light" }}</button></li>
@@ -145,7 +148,7 @@
                         {{/if}}
                         {{#if git_repository_url}}
                         <a href="{{git_repository_url}}" title="Git repository" aria-label="Git repository">
-                            <i id="git-repository-button" class="fa {{git_repository_icon}}"></i>
+                            <i id="git-repository-button" class="fab {{git_repository_icon}}"></i>
                         </a>
                         {{/if}}
                     </div>

src/theme/mod.rs

@@ -29,14 +29,35 @@ pub static TOMORROW_NIGHT_CSS: &[u8] = include_bytes!("tomorrow-night.css");
 pub static HIGHLIGHT_CSS: &[u8] = include_bytes!("highlight.css");
 pub static AYU_HIGHLIGHT_CSS: &[u8] = include_bytes!("ayu-highlight.css");
 pub static CLIPBOARD_JS: &[u8] = include_bytes!("clipboard.min.js");
-pub static FONT_AWESOME: &[u8] = include_bytes!("FontAwesome/css/font-awesome.min.css");
-pub static FONT_AWESOME_EOT: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.eot");
-pub static FONT_AWESOME_SVG: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.svg");
-pub static FONT_AWESOME_TTF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.ttf");
-pub static FONT_AWESOME_WOFF: &[u8] = include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff");
-pub static FONT_AWESOME_WOFF2: &[u8] =
-    include_bytes!("FontAwesome/fonts/fontawesome-webfont.woff2");
-pub static FONT_AWESOME_OTF: &[u8] = include_bytes!("FontAwesome/fonts/FontAwesome.otf");
+pub static FONT_AWESOME: &[u8] = include_bytes!("FontAwesome/css/all.min.css");
+pub static FONT_AWESOME_V4_SHIMS: &[u8] = include_bytes!("FontAwesome/css/v4-shims.min.css");
+pub static FONT_AWESOME_BRANDS_EOT: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-brands-400.eot");
+pub static FONT_AWESOME_BRANDS_SVG: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-brands-400.svg");
+pub static FONT_AWESOME_BRANDS_TTF: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-brands-400.ttf");
+pub static FONT_AWESOME_BRANDS_WOFF: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-brands-400.woff");
+pub static FONT_AWESOME_BRANDS_WOFF2: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-brands-400.woff2");
+pub static FONT_AWESOME_REGULAR_EOT: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-regular-400.eot");
+pub static FONT_AWESOME_REGULAR_SVG: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-regular-400.svg");
+pub static FONT_AWESOME_REGULAR_TTF: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-regular-400.ttf");
+pub static FONT_AWESOME_REGULAR_WOFF: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-regular-400.woff");
+pub static FONT_AWESOME_REGULAR_WOFF2: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-regular-400.woff2");
+pub static FONT_AWESOME_SOLID_EOT: &[u8] = include_bytes!("FontAwesome/webfonts/fa-solid-900.eot");
+pub static FONT_AWESOME_SOLID_SVG: &[u8] = include_bytes!("FontAwesome/webfonts/fa-solid-900.svg");
+pub static FONT_AWESOME_SOLID_TTF: &[u8] = include_bytes!("FontAwesome/webfonts/fa-solid-900.ttf");
+pub static FONT_AWESOME_SOLID_WOFF: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-solid-900.woff");
+pub static FONT_AWESOME_SOLID_WOFF2: &[u8] =
+    include_bytes!("FontAwesome/webfonts/fa-solid-900.woff2");
 
 /// The `Theme` struct should be used instead of the static variables because
 /// the `new()` method will look if the user has a theme directory in their