Merge pull request #6248 from ci-wataru-kashii/fix/Deprecate_division…

…_Outside_Of_Calc npm run build 時のDeplicate error を修正
EC-CUBE · Sep 11, 2024 · 1a0f595 · 1a0f595
2 parents 4a80b63 + 24671cf
commit 1a0f595
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 15 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
@@ -5,7 +5,7 @@
   li {
     display: flex;
     flex-wrap: wrap;
-    align-items: start;
+    align-items: flex-start;
     margin-top: 5px;
     margin-bottom: 0;
     > a, span {

diff --git a/html/template/default/assets/css/style.css.map b/html/template/default/assets/css/style.css.map
diff --git a/html/template/default/assets/css/style.min.css.map b/html/template/default/assets/css/style.min.css.map
diff --git a/html/template/default/assets/scss/component/_5.1.grid.scss b/html/template/default/assets/scss/component/_5.1.grid.scss
@@ -1,3 +1,4 @@
+@use "sass:math";
 @import "../mixins/clearfix";
 @import "../mixins/media";
 
@@ -14,7 +15,7 @@
   min-height: 1px;
 
   @media (min-width: $desktop) {
-    width: percentage(($columns/ 12));
+    width: percentage(math.div($columns, 12));
   }
   @include media_desktop{
   }
@@ -169,7 +170,7 @@ Styleguide 5.1.5
     margin: 0;
     @include media_desktop {
       @include makeSmColumn(10);
-      margin-left: percentage((1 / 12));
+      margin-left: percentage(math.div(1, 12));
     }
   }
 }
@@ -193,7 +194,7 @@ Styleguide 5.1.6
     margin: 0;
     @include media_desktop {
       @include makeSmColumn(8);
-      margin-left: percentage((2 / 12));
+      margin-left: percentage(math.div(2, 12));
     }
   }
 }
@@ -215,7 +216,7 @@ Styleguide 5.1.7
     margin: 0;
     @include media_desktop {
       @include makeSmColumn(6);
-      margin-left: percentage((3 / 12));
+      margin-left: percentage(math.div(3, 12));
     }
   }
 }
@@ -238,7 +239,7 @@ Styleguide 5.1.8
     margin: 0;
     @include media_desktop {
       @include makeSmColumn(4);
-      margin-left: percentage((4 / 12));
+      margin-left: percentage(math.div(4, 12));
     }
   }
 }

diff --git a/html/template/default/assets/scss/component/_5.2.layout.scss b/html/template/default/assets/scss/component/_5.2.layout.scss
@@ -1,3 +1,4 @@
+@use "sass:math";
 @import "../mixins/projects";
 @import "../mixins/clearfix";
 @import "../mixins/media";
@@ -16,7 +17,7 @@
 
   @media (min-width: $desktop) {
     float: left;
-    width: percentage(($columns/ 12));
+    width: percentage(math.div($columns, 12));
   }
 }