Merge pull request #137 from EC-CUBE/dev

更新差分を一旦リリース

assets/js/script.js

@@ -30,13 +30,32 @@ $(function(){
     })
 })
 
+$(function(){
+    $(".ec-orderMail__link").on("click",function(){
+        $(".ec-orderMail__body").slideToggle();
+    })
+})
+$(function(){
+    $(".ec-orderMail__close").on("click",function(){
+        $(".ec-orderMail__body").slideToggle();
+
+    })
+})
+
 $(function(){
     $(".is_inDrawer").each(function(){
         var html = $(this).html();
         $(html).appendTo(".ec-drawerRole")
     })
 })
 
+$(function(){
+    $(".ec-blockTopBtn").on("click",function(){
+        $("html,body").animate({"scrollTop":0},500);
+    })
+})
+
+
 // Slick Slide
 // TODO FIX CLASS NAME
 $(function(){

assets/scss/component/1.3.list.scss

@@ -86,23 +86,23 @@ Styleguide 1.3.2
     display: flex;
     border-bottom: 1px dotted #ccc;
     margin: 0;
-    padding: 8px 0;
+    padding: 10px 0 0;
     flex-wrap: wrap;
     @include media_desktop {
       flex-wrap: nowrap;
+      padding: 15px 0 4px;
     }
   }
   dt, dd {
     padding: 0;
-    @include media_desktop {
-      padding: 0 16px;
-    }
   }
 
   dt {
     font-weight: normal;
     width: 100%;
+    padding-top: 0;
     @include media_desktop {
+      padding-top: 14px;
       width: 30%;
     }
   }

assets/scss/component/2.1.buttonsize.scss

@@ -68,3 +68,32 @@ Styleguide 2.1.2
   @include blockBtn-cancel
 }
 
+/*
+ページトップボタン
+
+ページトップボタンを表示します
+
+ex [商品詳細ページ　カートボタン部分](http://demo3.ec-cube.net/products/detail/30)
+
+Markup:
+.ec-blockTopBtn
+
+Styleguide 2.1.3
+*/
+.ec-blockTopBtn{
+  position: fixed;
+  width:120px;
+  height: 40px;
+  right:30px;
+  bottom: 30px;
+  cursor: pointer;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 40px;
+  opacity: 0.8;
+  background-color: #9da3a9;
+
+  &:after{
+    content: "ページトップへ";
+  }
+}

assets/scss/component/3.1.inputText.scss

@@ -36,21 +36,21 @@ Styleguide 3.1.1
   @include forms-reset;
   @include form-controls;
   input{
-    margin-bottom: 16px;
     height: 40px;
     font-family: Roboto, "游ゴシック", YuGothic, "Yu Gothic", "ヒラギノ角ゴ ProN W3", "Hiragino Kaku Gothic ProN", Arial, "メイリオ", Meiryo, sans-serif;
+    margin-bottom: 10px;
+    @include media_desktop {
+      margin-bottom: 16px;
+    }
   }
   p {
     line-height: 1.4;
   }
-  .errorMail {
-    display: none;
-  }
-  .errorPassword {
-    display: none;
-  }
-  .errorPassword2 {
-    display: none;
+  .ec-errorMessage {
+    margin-bottom: 25px;
+    font-size: 12px;
+    font-weight: bold;
+    color: $clrRed;
   }
 }
 .error.ec-input {
@@ -59,22 +59,6 @@ Styleguide 3.1.1
     border-color: #CF3F34;
     background: #FDF1F0;
   }
-  @mixin  errortext {
-    display: block;
-    margin-bottom: 25px;
-    font-size: 12px;
-    font-weight: bold;
-    color: $clrRed;
-  }
-  .errorMail {
-    @include errortext;
-  }
-  .errorPassword {
-    @include errortext;
-  }
-  .errorPassword2 {
-    @include errortext;
-  }
 }
 
 /*
@@ -99,13 +83,16 @@ Styleguide 3.1.2
   @extend .ec-input;
   input[type='text']{
     display: inline-block;
-    width: 49%;
-    margin-left: 0;
+    width: 47%;
+    margin-left: 2%;
     @include media_desktop {
       margin-left: 15px;
       width: 45%;
     }
   }
+  input[type='text']:first-child{
+    margin-left: 0;
+  }
 }
 
 /*

assets/scss/component/3.3.form.scss

@@ -26,14 +26,9 @@ Markup:
 Styleguide 3.3.1
 */
 .ec-label{
-  display: block;
-  padding: 5px 0 ;
+  display: inline-block;
   font-weight: bold;
-  margin-bottom: 0;
-  @include media_desktop {
-    padding: 12px;
-    margin-bottom: 5px;
-  }
+  margin-bottom: 5px;
 }
 
 /*
@@ -57,8 +52,13 @@ Styleguide 3.3.2
 */
 
 .ec-required{
+  display: inline-block;
+  margin-left: .8em;
+  vertical-align: 2px;
   color: #DE5D50;
-  margin-left: 1em;
   font-size: 12px;
   font-weight: normal;
+  @include media_desktop {
+    margin-left: 1em;
+  }
 }

assets/scss/component/6.3.login.scss → assets/scss/component/6.1.login.scss

@@ -58,21 +58,15 @@ Styleguide 6.1.1
       margin-left: 20px;
     }
   }
-  & &__error {
-    display: none;
+  .ec-errorMessage {
     color: $clrRed;
   }
 }
-.ec-login.is_active {
+.ec-login.error {
   @include media_desktop {
     height: 500px;
   }
 }
-.is_active {
-  .ec-login__error{
-    display: block;
-  }
-}
 
 /*
 ゲスト購入

assets/scss/mixins/_forms.scss

@@ -54,7 +54,8 @@
   background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid $input-border;
   border-radius: $input-border-radius; // Note: This has no effect on <select>s in some browsers, due to the limited stylability of <select>s in CSS.
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  -webkit-appearance: none;
+  @include box-shadow(none);
   @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
 
   // Customize the `:focus` state to imitate native WebKit styles.

assets/scss/project/11.1.role.scss

@@ -26,7 +26,7 @@ ex [マイページ　コンテナ](http://demo3.ec-cube.net/mypage)
 
 Markup:
 include /assets/tmpl/elements/11.1.role.pug
-+ec-roleRole
++ec-mypageRole
 
 Styleguide 11.1.2
 */