Merge pull request #121 from Fox32/master

Upgrade font awesome to the latest version
google · Aug 15, 2019 · 929f25a · 929f25a
2 parents ff96908 + d413a68
commit 929f25a
Show file tree

Hide file tree

Showing 19 changed files with 8,894 additions and 3,828 deletions.
diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss
@@ -13,7 +13,7 @@ $enable-shadows: true;
 
 // Theme flags.
 
-$td-enable-google-fonts: true;
+$td-enable-google-fonts: true !default;
 
 // Theme colors
 

diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -5,9 +5,9 @@
 
 @import "../vendor/bootstrap/scss/bootstrap";
 
-@import "../vendor/Font-Awesome//web-fonts-with-css/scss/fontawesome.scss";
-@import "../vendor/Font-Awesome//web-fonts-with-css/scss/fa-solid.scss";
-@import "../vendor/Font-Awesome//web-fonts-with-css/scss/fa-brands.scss";
+@import "../vendor/Font-Awesome/scss/fontawesome.scss";
+@import "../vendor/Font-Awesome/scss/solid.scss";
+@import "../vendor/Font-Awesome/scss/brands.scss";
 
 @import "support/utilities";
 @import "colors";

diff --git a/assets/vendor/Font-Awesome b/assets/vendor/Font-Awesome
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -8,6 +8,6 @@
 <script src="{{ $js.RelPermalink }}"></script>
 {{ else }}
 {{ $js := $js | minify | fingerprint }}
-<script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}"></script>
+<script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}" crossorigin="anonymous"></script>
 {{ end }}
 {{ partial "hooks/body-end.html" . }}
diff --git a/static/webfonts/fa-brands-400.eot b/static/webfonts/fa-brands-400.eot
diff --git a/static/webfonts/fa-brands-400.svg b/static/webfonts/fa-brands-400.svg
diff --git a/static/webfonts/fa-brands-400.ttf b/static/webfonts/fa-brands-400.ttf
diff --git a/static/webfonts/fa-brands-400.woff b/static/webfonts/fa-brands-400.woff
diff --git a/static/webfonts/fa-brands-400.woff2 b/static/webfonts/fa-brands-400.woff2
diff --git a/static/webfonts/fa-regular-400.eot b/static/webfonts/fa-regular-400.eot
diff --git a/static/webfonts/fa-regular-400.svg b/static/webfonts/fa-regular-400.svg
diff --git a/static/webfonts/fa-regular-400.ttf b/static/webfonts/fa-regular-400.ttf
diff --git a/static/webfonts/fa-regular-400.woff b/static/webfonts/fa-regular-400.woff
diff --git a/static/webfonts/fa-regular-400.woff2 b/static/webfonts/fa-regular-400.woff2
diff --git a/static/webfonts/fa-solid-900.eot b/static/webfonts/fa-solid-900.eot
diff --git a/static/webfonts/fa-solid-900.svg b/static/webfonts/fa-solid-900.svg
diff --git a/static/webfonts/fa-solid-900.ttf b/static/webfonts/fa-solid-900.ttf
diff --git a/static/webfonts/fa-solid-900.woff b/static/webfonts/fa-solid-900.woff
diff --git a/static/webfonts/fa-solid-900.woff2 b/static/webfonts/fa-solid-900.woff2