try to upgrade #22

Riverscapes · Mar 1, 2021 · 7e3d19e · 7e3d19e
1 parent 60e8ca2
commit 7e3d19e
Show file tree

Hide file tree

Showing 25 changed files with 9,581 additions and 2,681 deletions.
diff --git a/_sass/app.scss b/_sass/app.scss
@@ -8,7 +8,7 @@
 // This grabs all our foundation settings
 // @import 'motion-ui/motion-ui';
 @import 'settings';
-@import '../node_modules/font-awesome/scss/font-awesome';
+@import '../node_modules/@fortawesome/fontawesome-free/scss/fontawesome';
 @import 'github';
 
 // Main sections

diff --git a/assets/css/style.css b/assets/css/style.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/package.json b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {},
   "devDependencies": {
-    "font-awesome": "4.7.0",
+    "@fortawesome/fontawesome-free": "5.15.2",
     "foundation-sites": "6.6.3",
     "jquery": "3.5.1",
     "motion-ui": "2.0.3",

diff --git a/script/foundation.sh b/script/foundation.sh
@@ -8,12 +8,12 @@ cp -fr node_modules/motion-ui/src _sass/motion-ui
 rm -fr _sass/foundation-sites
 cp -fr node_modules/foundation-sites/scss _sass/foundation-sites
 
-rm -fr _sass/font-awesome
-cp -fr node_modules/font-awesome/scss _sass/font-awesome
+# rm -fr _sass/font-awesome
+# cp -fr node_modules/@fortawesome/fontawesome-free/scss _sass/font-awesome
 
 # Also grab the font-awesome fonts
 rm -fr assets/fonts
-cp -fr node_modules/font-awesome/fonts assets/fonts
+cp -fr node_modules/@fortawesome/fontawesome-free/webfonts/ assets/fonts
 
 
 # We only need a few JS files