Merge pull request #652 from drnlm/feature/switch_to_latest_font_package

Update to more modern fontawesome package to make npm happy
CTPUG · Jan 18, 2023 · dd9b45e · dd9b45e
2 parents 89f2566 + 8b2b63d
commit dd9b45e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free-webfonts": "1.0.x",
+    "@fortawesome/fontawesome-free": "6.2.x",
     "bootstrap": "^4.0.0",
     "jquery": ">=1.9.1",
     "popper.js": "1.16.x"

diff --git a/wafer/templates/wafer/base.html b/wafer/templates/wafer/base.html
@@ -9,8 +9,8 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   {% block wafer_css %}
   <link href="{% static 'vendor/bootstrap/dist/css/bootstrap.min.css' %}" rel="stylesheet">
-  <link href="{% static 'vendor/@fortawesome/fontawesome-free-webfonts/css/fontawesome.css' %}" rel="stylesheet">
-  <link href="{% static 'vendor/@fortawesome/fontawesome-free-webfonts/css/fa-solid.css' %}" rel="stylesheet">
+  <link href="{% static 'vendor/@fortawesome/fontawesome-free/css/fontawesome.css' %}" rel="stylesheet">
+  <link href="{% static 'vendor/@fortawesome/fontawesome-free/css/solid.css' %}" rel="stylesheet">
   <link href="{% static 'css/wafer.css' %}" rel="stylesheet">
   {% endblock %}
   {% block extra_head %}{% endblock %}