Merge pull request #81 from EC-CUBE/dev

0.0.5 リリース待ち
EC-CUBE · Apr 24, 2017 · d68c746 · d68c746
2 parents b964757 + 9b144fc
commit d68c746
Show file tree

Hide file tree

Showing 33 changed files with 781 additions and 462 deletions.
diff --git a/assets/gulp/browserSync.js b/assets/gulp/browserSync.js
@@ -80,7 +80,7 @@ gulp.task("server",()=> {
         `${dest}/**/*`,
         `${src}/assets/tmpl/**/*`
     ], (e) => {
-        console.log(e)
+        // console.log(e)
         setTimeout(function(){
             browserSync.reload();
         },500);

diff --git a/assets/scss/component/2.2.closebutton.scss b/assets/scss/component/2.2.closebutton.scss
@@ -1,3 +1,4 @@
+@import "../mixins/variables";
 /*
 アイコンボタン
 
@@ -29,7 +30,7 @@ Styleguide 2.2.1
   & &__icon{
     svg{
       overflow: hidden;
-      fill: #B8BEC4;
+      fill: $clrRightGray;
       margin-right: 5px;
       position: relative;
       top: -1px;

diff --git a/assets/scss/component/4.1.icon.scss b/assets/scss/component/4.1.icon.scss
@@ -46,7 +46,7 @@ Styleguide 4.1.1
 .ec-icon{
   svg{
     overflow: hidden;
-    fill: #E7E7E7;
+    fill: $clrRightGray;
     margin-right: 5px;
     position: relative;
     top: -1px;

diff --git a/assets/scss/component/6.3.login.scss b/assets/scss/component/6.3.login.scss
@@ -1,4 +1,5 @@
 @import "../mixins/media";
+@import "../mixins/projects";
 /*
 ログイン
 
@@ -46,6 +47,10 @@ Styleguide 6.1.1
       }
     }
   }
+  & &__actions {
+    color: #fff;
+    @include reset_link();
+  }
   & &__link {
     margin-top: 5px;
     margin-left: 0;
@@ -57,7 +62,6 @@ Styleguide 6.1.1
     display: none;
     color: $clrRed;
   }
-
 }
 .ec-login.is_active {
   @include media_desktop {
@@ -70,17 +74,18 @@ Styleguide 6.1.1
   }
 }
 
-  /*
-  ゲスト購入
+/*
+ゲスト購入
 
-  http://demo3.ec-cube.net/mypage
+http://demo3.ec-cube.net/mypage
 
-  Markup:
-  include /assets/tmpl/elements/6.3.login.pug
-  +ec-guest
+Markup:
+include /assets/tmpl/elements/6.3.login.pug
++ec-guest
+hoge
 
-  Styleguide 6.1.2
-  */
+Styleguide 6.1.2
+*/
 .ec-guest{
   display: table;
   margin: 0;
@@ -101,6 +106,13 @@ Styleguide 6.1.1
       margin-bottom: 16px;
     }
   }
+  & &__actions {
+    display: block;
+    vertical-align: middle;
+    text-align: center;
+    color: #fff;
+    @include reset_link();
+  }
   & &__icon{
     font-size: 70px;
     text-align: center;

diff --git a/assets/scss/component/7.1.itembanner.scss b/assets/scss/component/7.1.itembanner.scss
@@ -1,5 +1,5 @@
 @import "../mixins/media";
-
+@import "../mixins/projects";
 /*
 商品掲載
 
@@ -40,6 +40,7 @@ Styleguide 7.1.1
   & &__cell {
     width: 100%;
     margin-bottom: 16px;
+    @include reset_link();
     @include media_desktop {
       width: 31.4466%;
       margin-bottom: 0;
@@ -90,6 +91,7 @@ ex [トップページ　商品紹介部分](http://demo3.ec-cube.net/)
 Markup:
 include /assets/tmpl/elements/7.1.itembanner.pug
 +ec-displayC
+p hoge
 
 Styleguide 7.1.2
 */
@@ -101,6 +103,7 @@ Styleguide 7.1.2
   margin-bottom: 24px;
   & &__cell{
     width: 47%;
+    @include reset_link();
     @include media_desktop(){
       width: 22.8775%;
     }
@@ -172,6 +175,7 @@ Styleguide 7.1.3
   & &__cell{
     width: 30%;
     margin-bottom: 8px;
+    @include reset_link();
     @include media_desktop(){
       width: 14.3083%;
       margin-bottom: 16px;

diff --git a/assets/scss/component/7.2.search.scss b/assets/scss/component/7.2.search.scss
@@ -1,5 +1,6 @@
 @import "../mixins/media";
 @import "../mixins/variables";
+@import "../mixins/projects";
 
 @mixin pager(){
 }
@@ -43,6 +44,9 @@ Styleguide 7.2.1
     font-size: 16px;
   }
 
+  & &__item {
+    @include reset_link();
+  }
   & &__item,
   & &__divider,
   & &__item--active{
@@ -53,6 +57,7 @@ Styleguide 7.2.1
   }
   & &__item--active{
     font-weight: bold;
+    @include reset_link();
   }
 }
 
@@ -82,6 +87,7 @@ Styleguide 7.2.2
     padding: 0 3px 0 2px;
     text-align: center;
     position: relative;
+    @include reset_link();
     a{
       color: inherit;
       display: block;

diff --git a/assets/scss/component/7.3.cart.scss b/assets/scss/component/7.3.cart.scss
@@ -1,6 +1,7 @@
 @import "../mixins/variables";
 @import "../mixins/media";
 @import "../mixins/animation";
+@import "../mixins/projects";
 /*
 カート
 
@@ -199,6 +200,7 @@ Styleguide 7.3.5
 }
 
 .ec-cartNaviNull {
+  display: none;
   min-width: 256px;
   text-align: center;
   background: #f3f3f3;
@@ -287,6 +289,8 @@ Styleguide 7.3.6
     }
   }
   & &__btn {
+    @include reset_link();
+    color: #fff;
     .ec-blockBtn--action {
       font-size: 16px;
       font-weight: bold;

diff --git a/assets/scss/component/8.1.info.scss b/assets/scss/component/8.1.info.scss
@@ -30,20 +30,26 @@ Styleguide 8.1.1
   margin-bottom: 16px;
   background: #F8F8F8;
   @include media_desktop {
-    padding-left: 15px;
+    margin-right: 3%;
   }
   @include media_desktop {
     margin-bottom: 32px;
   }
   & &__title{
     font-weight: bold;
-    padding: 16px;
-    font-size: 24px;
+    padding: 8px;
+    font-size: 16px;
+    text-align: center;
+    @include media_desktop {
+      padding: 16px;
+      text-align: left;
+      font-size: 24px;
+    }
   }
   & &__items{
     padding: 0;
     list-style: none;
-    border-top: 1px solid #ccc;
+    border-top: 1px dotted #ccc;
   }
 }
 /*
@@ -128,8 +134,8 @@ Styleguide 8.1.3
   font-weight: bold;
   border: 1px solid #ccc;
   @include media_desktop {
-    margin-left: 16px;
-    margin-bottom: 0;
+    margin-left: 3%;
+    margin-bottom: 16px;
   }
   & &__intro {
     color: #DE5D50;

diff --git a/assets/scss/mixins/media.scss b/assets/scss/mixins/media.scss
@@ -64,7 +64,7 @@ Twitter Bootstrap デフォルト準拠
   @include clearfix;
   @include commonStyle();
   width: 100%;
-  max-width: 1150px;
+  //max-width: 1150px;
   @include media_desktop {
     padding-left:  26px;
     padding-right: 26px;

diff --git a/assets/scss/mixins/variables.scss b/assets/scss/mixins/variables.scss
@@ -10,5 +10,7 @@ $font-size: 16px;
 $clrRed: #DE5D50;
 $clrRich: #9a947e;
 $clrGray: #F3F3F3;
-
+$clrRightGray: #B8BEC4;
+$clrExtraGray: #636378;
+$clrDarkGray:#525263;
 @import "../../../node_modules/bootstrap-sass/assets/stylesheets/bootstrap/variables";