Merge pull request #358 from nvisionative/update-font-awesome

Update font awesome to latest version and usage
nvisionative · Dec 28, 2023 · 1079293 · 1079293
2 parents 2e75dde + fbcead7
commit 1079293
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -32,11 +32,18 @@ const paths = {
     dest: './dist/fonts/'
   },
   faFonts: {
-    src: './node_modules/@fortawesome/fontawesome-free/webfonts/*',
+    src: [
+      './node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.*',
+      './node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*'
+    ],
     dest: './dist/webfonts/'
   },
   faCss: {
-    src: './node_modules/@fortawesome/fontawesome-free/css/all.min.css',
+    src: [
+      './node_modules/@fortawesome/fontawesome-free/css/brands.min.css',
+      './node_modules/@fortawesome/fontawesome-free/css/solid.min.css',
+      './node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css',
+    ],
     dest: './dist/css/'
   },
   normalize: {

diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
   "license": "GPL-3.0",
   "private": true,
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^6.2.0",
+    "@fortawesome/fontawesome-free": "^6.5.1",
     "bootstrap": "^5.2.2",
     "normalize.css": "^8.0.1"
   },

diff --git a/partials/_includes.ascx b/partials/_includes.ascx
@@ -1,8 +1,10 @@
 <dnn:META ID="mobileScale" runat="server" Name="viewport" Content="width=device-width, initial-scale=1.0" />
 <dnn:DnnCssExclude runat="server" Name="dnndefault" /> 
 
-<dnn:DnnCssInclude runat="server" FilePath="dist/css/all.min.css" Priority="100" PathNameAlias="SkinPath" />
-<dnn:DnnCssInclude runat="server" FilePath="dist/css/style.min.css" Priority="110" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude runat="server" FilePath="dist/css/fontawesome.min.css" Priority="100" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude runat="server" FilePath="dist/css/brands.min.css" Priority="110" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude runat="server" FilePath="dist/css/solid.min.css" Priority="120" PathNameAlias="SkinPath" />
+<dnn:DnnCssInclude runat="server" FilePath="dist/css/style.min.css" Priority="130" PathNameAlias="SkinPath" />
 
 <dnn:DnnJsInclude runat="server" FilePath="dist/js/bootstrap.bundle.min.js" ForceProvider="DnnFormBottomProvider" Priority="100" PathNameAlias="SkinPath" />
 <dnn:DnnJsInclude runat="server" FilePath="dist/js/custom.min.js" ForceProvider="DnnFormBottomProvider" Priority="110" PathNameAlias="SkinPath" />
@@ -15,7 +17,6 @@
         var fonts = new string[]
         {
             "dist/webfonts/fa-brands-400",
-            "dist/webfonts/fa-regular-400",
             "dist/webfonts/fa-solid-900",
             "dist/fonts/OpenSans-Bold",
             "dist/fonts/OpenSans-BoldItalic",

diff --git a/yarn.lock b/yarn.lock
@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@fortawesome/fontawesome-free@^6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5"
-  integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ==
+"@fortawesome/fontawesome-free@^6.5.1":
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258"
+  integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw==
 
 "@jridgewell/gen-mapping@^0.3.0":
   version "0.3.2"