Merge pull request #70 from EC-CUBE/dev

fix_build_task
EC-CUBE · Apr 10, 2017 · 910b501 · 910b501
2 parents 64f890f + 61948a2
commit 910b501
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/assets/scss/project/18.1.password.scss b/assets/scss/project/18.1.password.scss
@@ -1,3 +1,4 @@
+@import "../mixins/media";
 /*
 パスワードリセット
 

diff --git a/assets/scss/project/19.3.customer.scss b/assets/scss/project/19.3.customer.scss
@@ -22,7 +22,7 @@ Styleguide 19.3
 }
 .ec-blockBtn--action {
   margin-bottom: 10px;
-  @included media_desktop {
+  @include media_desktop {
   margin-bottom: 16px;
   }
 }

diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "build:styleguide:clean": "rm -rf ./public/",
     "build:styleguide:generate": "gulp styleguide:generateOnly",
     "build:styleguide:applystyles": "gulp styleguide:applystyles",
-    "build:moc": "run-p build:moc:*",
+    "build:moc": "run-s build:moc:*",
     "build:moc:webpack": "webpack",
     "build:moc:sass": "gulp sass",
     "build:moc:pug": "gulp pug"