Remove loading fontawesome 4

EC-CUBE · Aug 17, 2022 · 9e26a09 · 9e26a09
1 parent 8fca2da
commit 9e26a09
Show file tree

Hide file tree

Showing 10 changed files with 97 additions and 68 deletions.
diff --git a/html/template/admin/assets/css/app.css b/html/template/admin/assets/css/app.css
diff --git a/html/template/admin/assets/css/app.css.map b/html/template/admin/assets/css/app.css.map
diff --git a/html/template/admin/assets/css/app.min.css b/html/template/admin/assets/css/app.min.css
diff --git a/html/template/admin/assets/css/app.min.css.map b/html/template/admin/assets/css/app.min.css.map
diff --git a/html/template/admin/assets/scss/component/_directory.scss b/html/template/admin/assets/scss/component/_directory.scss
@@ -15,30 +15,33 @@ Styleguide 7.0
   //1層目
   label {
     &::before {
-      content: "\f147";
+      content: "\f146";
       display: inline-block;
       margin-right: .5em;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 16px;
+      font-weight: 400;
     }
   }
   label[data-toggle="collapse"] {
     &::before {
-      content: "\f147";
+      content: "\f146";
       display: inline-block;
       margin-right: .5em;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 16px;
+      font-weight: 400;
     }
   }
 
   label.collapsed {
     &::before {
-      content: "\f196";
+      content: "\f0fe";
       display: inline-block;
       margin-right: .5em;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 16px;
+      font-weight: 400;
     }
   }
   //2層目以降
@@ -70,33 +73,36 @@ Styleguide 7.0
     }
     label {
       &::after {
-        content: "\f147";
+        content: "\f146";
         display: inline-block;
         margin-right: .5em;
-        font-family: FontAwesome;
+        font-family: 'Font Awesome 5 Free';
         font-size: 16px;
+        font-weight: 400;
         position: absolute;
         left: 20px;
       }
     }
     label[data-toggle="collapse"] {
       &::after {
-        content: "\f147";
+        content: "\f146";
         display: inline-block;
         margin-right: .5em;
-        font-family: FontAwesome;
+        font-family: 'Font Awesome 5 Free';
         font-size: 16px;
+        font-weight: 400;
         position: absolute;
         left: 20px;
       }
     }
     label.collapsed {
       &::after {
-        content: "\f196";
+        content: "\f0fe";
         display: inline-block;
         margin-right: .5em;
-        font-family: FontAwesome;
+        font-family: 'Font Awesome 5 Free';
         font-size: 16px;
+        font-weight: 400;
         position: absolute;
         left: 20px;
       }
@@ -191,30 +197,32 @@ Styleguide 7.2
   //1層目
   label {
     &::before {
-      content: "\f114";
+      content: "\f07b";
       display: inline-block;
       margin-right: .5em;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 16px;
+      font-weight: 400;
     }
   }
   label[data-toggle="collapse"] {
     &::before {
-      content: "\f115";
+      content: "\f07c";
       display: inline-block;
       margin-right: .5em;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 16px;
-
+      font-weight: 400;
     }
   }
   label.collapsed {
     &::before {
-      content: "\f114";
+      content: "\f07b";
       display: inline-block;
       margin-right: .5em;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 16px;
+      font-weight: 400;
     }
   }
   //2層目以降
@@ -245,33 +253,36 @@ Styleguide 7.2
     }
     label {
       &::after {
-        content: "\f114";
+        content: "\f07b";
         display: inline-block;
         margin-right: .5em;
-        font-family: FontAwesome;
+        font-family: 'Font Awesome 5 Free';
         font-size: 16px;
+        font-weight: 400;
         position: absolute;
         left: 20px;
       }
     }
     label[data-toggle="collapse"] {
       &::after {
-        content: "\f115";
+        content: "\f07c";
         display: inline-block;
         margin-right: .5em;
-        font-family: FontAwesome;
+        font-family: 'Font Awesome 5 Free';
         font-size: 16px;
+        font-weight: 400;
         position: absolute;
         left: 20px;
       }
     }
     label.collapsed {
       &::after {
-        content: "\f114";
+        content: "\f07b";
         display: inline-block;
         margin-right: .5em;
-        font-family: FontAwesome;
+        font-family: 'Font Awesome 5 Free';
         font-size: 16px;
+        font-weight: 400;
         position: absolute;
         left: 20px;
       }

diff --git a/html/template/admin/assets/scss/component/_form.scss b/html/template/admin/assets/scss/component/_form.scss
@@ -54,8 +54,9 @@ p 項目の内容はドラッグ＆ドロップで変更可能です。
 
     .delete-image {
       display: none;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 18px;
+      font-weight: 400;
       line-height: 1;
       color: #54687A;
       padding: 5px;
@@ -73,8 +74,9 @@ p 項目の内容はドラッグ＆ドロップで変更可能です。
 
     .delete-image {
       display: inline-block;
-      font-family: FontAwesome;
+      font-family: 'Font Awesome 5 Free';
       font-size: 18px;
+      font-weight: 400;
       line-height: 1;
       color: #54687A;
       padding: 5px;