Upgrade FontAwesome to v6 (#1694)

unicef · May 10, 2024 · beb3ffa · beb3ffa
1 parent 9d3a894
commit beb3ffa
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 819 deletions.
diff --git a/home/static/css/fontawesome/css/fontawesome.min.css b/home/static/css/fontawesome/css/fontawesome.min.css
diff --git a/home/static/css/fontawesome/css/regular.min.css b/home/static/css/fontawesome/css/regular.min.css
diff --git a/home/static/css/fontawesome/css/solid.min.css b/home/static/css/fontawesome/css/solid.min.css
@@ -0,0 +1,6 @@
+/*!
+ * Font Awesome Free 6.5.2 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+ * Copyright 2024 Fonticons, Inc.
+ */
+:host,:root{--fa-style-family-classic:"Font Awesome 6 Free";--fa-font-solid:normal 900 1em/1 "Font Awesome 6 Free"}@font-face{font-family:"Font Awesome 6 Free";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.ttf) format("truetype")}.fa-solid,.fas{font-weight:900}
diff --git a/home/static/css/fontawesome/webfonts/fa-regular-400.eot b/home/static/css/fontawesome/webfonts/fa-regular-400.eot
diff --git a/home/static/css/fontawesome/webfonts/fa-regular-400.svg b/home/static/css/fontawesome/webfonts/fa-regular-400.svg
diff --git a/home/static/css/fontawesome/webfonts/fa-regular-400.ttf b/home/static/css/fontawesome/webfonts/fa-regular-400.ttf
diff --git a/home/static/css/fontawesome/webfonts/fa-regular-400.woff b/home/static/css/fontawesome/webfonts/fa-regular-400.woff
diff --git a/home/static/css/fontawesome/webfonts/fa-regular-400.woff2 b/home/static/css/fontawesome/webfonts/fa-regular-400.woff2
diff --git a/home/static/css/fontawesome/webfonts/fa-solid-900.ttf b/home/static/css/fontawesome/webfonts/fa-solid-900.ttf
diff --git a/home/static/css/fontawesome/webfonts/fa-solid-900.woff2 b/home/static/css/fontawesome/webfonts/fa-solid-900.woff2
diff --git a/home/wagtail_hooks.py b/home/wagtail_hooks.py
@@ -88,17 +88,19 @@ def global_admin_css():
     )
 
 @hooks.register("insert_global_admin_css")
-def import_fontawesome_stylesheet():
-    return "\n".join([
-        format_html(
-            '<link rel="stylesheet" href="{}">',
-            static("css/fontawesome/css/fontawesome.min.css"),
-        ),
-        format_html(
-            '<link rel="stylesheet" href="{}">',
-            static("css/fontawesome/css/regular.min.css"),
-        ),
-    ])
+def import_fontawesome_stylesheets():
+    return "\n".join(
+        [
+            format_html(
+                '<link rel="stylesheet" href="{}">',
+                static("css/fontawesome/css/fontawesome.min.css"),
+            ),
+            format_html(
+                '<link rel="stylesheet" href="{}">',
+                static("css/fontawesome/css/solid.min.css"),
+            ),
+        ]
+    )
 
 
 @hooks.register('insert_global_admin_js', order=100)

diff --git a/iogt/static/js/admin.js b/iogt/static/js/admin.js
@@ -41,6 +41,8 @@ function customizeUI() {
         'The descriptive text displayed underneath a headline in search engine results, and automatically loaded ' +
         'as a description into shares on social media eg Facebook Posts or shared links in WhatsApp.'
     );
+
+    configureEasyMDE();
 }
 
 function validateFileUpload(fileInput, file_size_threshold) {
@@ -70,4 +72,10 @@ function validateFreeBasicsFileUpload(fileInput, file_size_threshold) {
     return true;
 }
 
+function configureEasyMDE() {
+    window.wagtailMarkdown = window.wagtailMarkdown || {};
+    window.wagtailMarkdown.options = window.wagtailMarkdown.options || {};
+    window.wagtailMarkdown.options.spellChecker = false;
+}
+
 $(document).ready(customizeUI);