Merge pull request #70 from BaankeyBihari/Fontawesome-5

Font-Awesome 5
kelyvin · Jan 6, 2019 · ddb46d0 · ddb46d0
2 parents a701bee + e954a14
commit ddb46d0
Show file tree

Hide file tree

Showing 28 changed files with 4,518 additions and 2,688 deletions.
diff --git a/assets/css/caffeine-theme.css b/assets/css/caffeine-theme.css
diff --git a/assets/fonts/FontAwesome.otf b/assets/fonts/FontAwesome.otf
diff --git a/assets/fonts/fa-brands-400.eot b/assets/fonts/fa-brands-400.eot
diff --git a/assets/fonts/fa-brands-400.svg b/assets/fonts/fa-brands-400.svg
diff --git a/assets/fonts/fa-brands-400.ttf b/assets/fonts/fa-brands-400.ttf
diff --git a/assets/fonts/fa-brands-400.woff b/assets/fonts/fa-brands-400.woff
diff --git a/assets/fonts/fa-brands-400.woff2 b/assets/fonts/fa-brands-400.woff2
diff --git a/assets/fonts/fa-regular-400.eot b/assets/fonts/fa-regular-400.eot
diff --git a/assets/fonts/fa-regular-400.svg b/assets/fonts/fa-regular-400.svg
diff --git a/assets/fonts/fa-regular-400.ttf b/assets/fonts/fa-regular-400.ttf
diff --git a/assets/fonts/fa-regular-400.woff b/assets/fonts/fa-regular-400.woff
diff --git a/assets/fonts/fa-regular-400.woff2 b/assets/fonts/fa-regular-400.woff2
diff --git a/assets/fonts/fa-solid-900.eot b/assets/fonts/fa-solid-900.eot
diff --git a/assets/fonts/fa-solid-900.svg b/assets/fonts/fa-solid-900.svg
diff --git a/assets/fonts/fa-solid-900.ttf b/assets/fonts/fa-solid-900.ttf
diff --git a/assets/fonts/fa-solid-900.woff b/assets/fonts/fa-solid-900.woff
diff --git a/assets/fonts/fa-solid-900.woff2 b/assets/fonts/fa-solid-900.woff2
diff --git a/assets/fonts/fontawesome-webfont.eot b/assets/fonts/fontawesome-webfont.eot
diff --git a/assets/fonts/fontawesome-webfont.svg b/assets/fonts/fontawesome-webfont.svg
diff --git a/assets/fonts/fontawesome-webfont.ttf b/assets/fonts/fontawesome-webfont.ttf
diff --git a/assets/fonts/fontawesome-webfont.woff b/assets/fonts/fontawesome-webfont.woff
diff --git a/assets/fonts/fontawesome-webfont.woff2 b/assets/fonts/fontawesome-webfont.woff2
diff --git a/assets/js/caffeine-theme.js b/assets/js/caffeine-theme.js
diff --git a/assets/scss/modules/_fonts.scss b/assets/scss/modules/_fonts.scss
@@ -1,3 +1,7 @@
 // Optimize css delivery
 // @import url(https://fonts.googleapis.com/css?family=Raleway:400,700|Roboto+Slab:300,400);
-@import '../../../node_modules/font-awesome/scss/font-awesome.scss';
+@import '../../../node_modules/\@fortawesome/fontawesome-free/scss/fontawesome.scss';
+@import '../../../node_modules/\@fortawesome/fontawesome-free/scss/brands.scss';
+@import '../../../node_modules/\@fortawesome/fontawesome-free/scss/regular.scss';
+@import '../../../node_modules/\@fortawesome/fontawesome-free/scss/solid.scss';
+@import '../../../node_modules/\@fortawesome/fontawesome-free/scss/v4-shims.scss';
diff --git a/assets/scss/modules/_variables.scss b/assets/scss/modules/_variables.scss
@@ -59,6 +59,9 @@ $font-h4               : $font-h3 * 0.85;
 $font-h5               : $font-h4 * 0.85;
 $font-h6               : $font-h5 * 0.85;
 
+/* FONT-AWESOME 5 */
+$fa-font-path:        "../fonts";
+
 /* ASIDE */
 
 $animation-time  : 350ms;

diff --git a/gulpfile.js b/gulpfile.js
@@ -60,7 +60,7 @@ src = {
     },
     fonts: {
         files: [
-            "node_modules/font-awesome/fonts/**.*"
+            "node_modules/\@fortawesome/fontawesome-free/webfonts/**.*"
         ],
         dest: "assets/fonts"
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,16 +47,16 @@
     "gulp-sass": "^4.0.1",
     "gulp-strip-css-comments": "1.2.0",
     "gulp-uglify": "^3.0.1",
-    "underscore.string": "3.3.4"
+    "underscore.string": "^3.3.5"
   },
   "engines": {
     "node": "^8.9.4"
   },
   "license": "MIT",
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^5.6.3",
     "bourbon": "^4.2.7",
     "fitvids": "^2.0.0",
-    "font-awesome": "^4.7.0",
     "fontfaceobserver": "^2.0.13",
     "ghosthunter": "git://github.com/jamalneufeld/ghostHunter.git",
     "prismjs": "^1.15.0",