Merge pull request #437 from Edirom/update-fontawesome

Update fontawesome to v6
Edirom · Jan 27, 2023 · 91dadcf · 91dadcf
2 parents e3a4780 + 0c9397e
commit 91dadcf
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 26 deletions.
diff --git a/build.xml b/build.xml
@@ -119,7 +119,7 @@
             <fileset dir="${wega.fonts.dir}">
                 <include name="2B*.*"/>
             </fileset>
-            <fileset dir="${frontend_libs.dir}/font-awesome/fonts/">
+            <fileset dir="${frontend_libs.dir}/@fortawesome/fontawesome-free/webfonts/">
                 <include name="*"/>
             </fileset>
             <fileset dir="${frontend_libs.dir}/Junicode-New/webfiles/">

diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
   "license": "(BSD-2-Clause OR CC-BY-4.0)",
   "private": false,
   "dependencies": {
+    "@fortawesome/fontawesome-free": "^6.2.1",
     "Easy-Responsive-Tabs-to-Accordion": "peterstadler/Easy-Responsive-Tabs-to-Accordion#develop",
     "Junicode-New": "https://github.com/psb1558/Junicode-New",
     "WeGA-ODD": "edirom/WeGA-ODD#develop",
@@ -22,7 +23,6 @@
     "datatables.net-buttons-bs4": "^2.1.1",
     "fittextjs": "^1.2.0",
     "flip": "nnattawat/flip",
-    "font-awesome": "^4.7.0",
     "google-code-prettify": "^1.0.3",
     "ion-rangeslider": "^2",
     "jquery": "^3.5.0",
@@ -45,6 +45,7 @@
   "frontendDependencies": {
     "target": "libs",
     "packages": [
+      "@fortawesome/fontawesome-free",
       "Easy-Responsive-Tabs-to-Accordion",
       "Junicode-New",
       "WeGA-ODD",
@@ -59,7 +60,6 @@
       "datatables.net-buttons-bs4",
       "fittextjs",
       "flip/dist",
-      "font-awesome",
       "google-code-prettify/{styles,bin,lang}",
       "ion-rangeslider/{css,img,js}",
       "jquery/dist/",

diff --git a/resources/sass/base/_variables.scss b/resources/sass/base/_variables.scss
@@ -83,6 +83,7 @@ $font-family-sans-serif-bold: 'CamingoDos-Bold';
 $font-family-serif:       Georgia, "Times New Roman", Times, serif;
 $font-family-base:        $font-family-sans-serif !default;
 $font-family-monospace:   SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+$fa-font-path: "../fonts";
 
 $font-size-base:              1rem; // Assumes the browser default, typically `16px`
 $font-size-lg:                $font-size-base * 1.25;

diff --git a/resources/sass/components/_breadcrumbs.scss b/resources/sass/components/_breadcrumbs.scss
@@ -9,8 +9,9 @@ ol.breadcrumb > li:not(:first-child) >  {
     *:first-child:before {
         padding: 0 8px;        
         content: "\f054\00a0";
-        font-family: "FontAwesome";
+        font-family: "Font Awesome 6 Free";
         font-size:smaller;
+        font-weight: 900;
     }
 }
 

diff --git a/resources/sass/components/_collapse.scss b/resources/sass/components/_collapse.scss
@@ -11,19 +11,19 @@ a.collapseSingle, a.collapseSingle:hover
 
 .collapseSingle[aria-expanded="false"]:after
 {
-    font-family: FontAwesome;
+    font-family: "Font Awesome 6 Free";
     font-style: normal;
-    font-weight: normal;
+    font-weight: 900;
     text-decoration: inherit;
     content:  "\f13a";
     margin-left: 10px;
 }
 
 .collapseSingle:after
 {
-    font-family: FontAwesome;
+    font-family: "Font Awesome 6 Free";
     font-style: normal;
-    font-weight: normal;
+    font-weight: 900;
     text-decoration: inherit;
     content:  "\f139";
     margin-left: 10px;
@@ -44,18 +44,18 @@ a.collapseSingle, a.collapseSingle:hover
 }
 
 .collapseMarker.collapsed:after {
-    font-family: FontAwesome;
+    font-family: "Font Awesome 6 Free";
     font-style: normal;
-    font-weight: normal;
+    font-weight: 900;
     text-decoration: inherit;
     content:  "\f13a";
     margin-left: 4px;
 }
 
 .collapseMarker:after {
-    font-family: FontAwesome;
+    font-family: "Font Awesome 6 Free";
     font-style: normal;
-    font-weight: normal;
+    font-weight: 900;
     text-decoration: inherit;
     content:  "\f139";
     margin-left: 4px;

diff --git a/resources/sass/components/_media.scss b/resources/sass/components/_media.scss
@@ -39,4 +39,5 @@ ul.media-list {
 li.media div.pull-left {
    width: 26px;
    text-align:center;
-}
+   float: left;
+}
diff --git a/resources/sass/components/_popover.scss b/resources/sass/components/_popover.scss
@@ -53,7 +53,7 @@
             margin-left:1em;
             :before {
             font-size:0.8em;
-            font-family:"FontAwesome";
+            font-family:"Font Awesome 6 Free";
             vertical-align:middle;
             content:"\f062";
             }

diff --git a/resources/sass/layout/_sidebar.scss b/resources/sass/layout/_sidebar.scss
@@ -9,7 +9,7 @@ form.searchfilter {
     padding-left: 30px;
     &:before {
         content: "\f096\00a0";
-        font-family: "FontAwesome";
+        font-family: "Font Awesome 6 Free";
         vertical-align: text-top;
         margin-right:11px;
         position: absolute;
@@ -63,15 +63,15 @@ a.checkbox-only {
 
 .checkbox input[type="checkbox"] + label::before {
     content: "\f096\00a0";
-    font-family: "FontAwesome";
+    font-family: "Font Awesome 6 Free";
     margin-right:8px;
     margin-left:2px;
     color: $gray;
 }
 
 .checkbox input[type="checkbox"]:checked + label::before {
     content: "\f14a\00a0";
-    font-family: "FontAwesome";
+    font-family: "Font Awesome 6 Free";
     margin-right:8px;
     margin-left:2px;
     color: $primary;
@@ -192,7 +192,7 @@ a.checkbox-only {
  .btn-group .dropdown-toggle .filter-option:after
 {
     content: "\f0d7";
-    font-family: "FontAwesome";
+    font-family: "Font Awesome 6 Free";
     font-style: normal;
     font-weight: normal;
     text-decoration: inherit;

diff --git a/resources/sass/main.scss b/resources/sass/main.scss
@@ -51,7 +51,9 @@
 @import "../../node_modules/bootstrap/scss/utilities";
 
 // non-bootstrap imports
-@import "../../node_modules/font-awesome/scss/font-awesome";
+@import "../../node_modules/@fortawesome/fontawesome-free/scss/fontawesome";
+@import "../../node_modules/@fortawesome/fontawesome-free/scss/solid";
+@import "../../node_modules/@fortawesome/fontawesome-free/scss/regular";
 @import "base/fonts";
 @import "base/helpers";
 @import "base/base";

diff --git a/resources/sass/pages/_apparatus.scss b/resources/sass/pages/_apparatus.scss
@@ -19,7 +19,8 @@
 
 .apparatus-link:before {
     font-size: 0.8em;
-    font-family:"FontAwesome";
+    font-family:"Font Awesome 6 Free";
+    font-weight: 900;
     content:"\f062";
     padding-right:4px;
 }
@@ -57,4 +58,4 @@ ul.apparatus > li {
         word-wrap:normal; /* overwrite the default to force no line break on Safari */
         font-size: ceil(($font-size-base * 0.9));
     }
-}
+}
diff --git a/yarn.lock b/yarn.lock
@@ -66,6 +66,11 @@
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz#949995a05c0d8801be7e0a594f775f1dbaa0d893"
   integrity sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w==
 
+"@fortawesome/fontawesome-free@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.1.tgz#344baf6ff9eaad7a73cff067d8c56bfc11ae5304"
+  integrity sha512-viouXhegu/TjkvYQoiRZK3aax69dGXxgEjpvZW81wIJdxm5Fnvp3VVIP4VHKqX4SvFw6qpmkILkD4RJWAdrt7A==
+
 "@fortawesome/fontawesome-svg-core@^1.2.36":
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz#343fac91fa87daa630d26420bfedfba560f85885"
@@ -512,11 +517,6 @@ flip@nnattawat/flip:
   version "1.1.2"
   resolved "https://codeload.github.com/nnattawat/flip/tar.gz/cbfef47f6248b42ff5b860cc2cad888d4e0c1b9a"
 
-font-awesome@^4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==
-
 frontend-dependencies@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/frontend-dependencies/-/frontend-dependencies-0.2.1.tgz#8325ea57bedde2c0f485c062169e1c3be0e40f0b"