Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -115,8 +115,8 @@
                 {{#each editorial}}
                 {{#each editorial}}
                     <div class="editorial-info">
                     <div class="editorial-info">
                         <a href="{{url}}" target="_blank">
                         <a href="{{url}}" target="_blank">
-                            <img class="lazy thumb" alt="{{title}}" data-original="{{image src 368 340}}" width="368"
-                                 height="340" style="display: block;">
+                            <img class="lazy thumb" alt="{{title}}" data-original="{{image src 368 240 2}}" width="368"
+                                 height="240" style="display: block;">
                         </a>
                         </a>
                         <div class="desc">
                         <div class="desc">
                             <a class="name" href="{{url}}" target="_blank">{{title}}</a>
                             <a class="name" href="{{url}}" target="_blank">{{title}}</a>

@@ -2,9 +2,6 @@ $hoverColor: #379ed6;
 
 
 .blk-cart-page {
 .blk-cart-page {
     .pros-group {
     .pros-group {
-        /*margin-bottom: 30px;
-        border-top: 1px solid #eee;*/
-
         &:first-child {
         &:first-child {
             border-top: none;
             border-top: none;
         }
         }
@@ -22,9 +19,10 @@ $hoverColor: #379ed6;
                     font-weight: normal !important;
                     font-weight: normal !important;
                     display: inline-block !important;
                     display: inline-block !important;
                 }
                 }
+
                 &:hover {
                 &:hover {
                     cursor: pointer;
                     cursor: pointer;
-                    border: 1px dashed #e92601;
+                    border: 1px dashed #3ca1db;
                 }
                 }
             }
             }
         }
         }
@@ -75,6 +73,7 @@ $hoverColor: #379ed6;
                 .checked {
                 .checked {
                     display: inline-block;
                     display: inline-block;
                 }
                 }
+
                 .not-checked {
                 .not-checked {
                     display: none;
                     display: none;
                 }
                 }
@@ -96,7 +95,6 @@ $hoverColor: #379ed6;
                 font-size: 18px;
                 font-size: 18px;
                 font-weight: bold;
                 font-weight: bold;
                 line-height: 50px;
                 line-height: 50px;
-
                 overflow: hidden;
                 overflow: hidden;
                 text-overflow: ellipsis !important;
                 text-overflow: ellipsis !important;
                 white-space: nowrap !important;
                 white-space: nowrap !important;
@@ -175,18 +173,21 @@ $hoverColor: #379ed6;
 
 
         .editable {
         .editable {
             padding: 5px 0;
             padding: 5px 0;
-            width: 200px;
+            width: 180px;
             position: relative;
             position: relative;
 
 
             .iconfont {
             .iconfont {
                 display: none;
                 display: none;
             }
             }
+
             .sizes-list {
             .sizes-list {
                 width: 195px;
                 width: 195px;
             }
             }
+
             .colors-list {
             .colors-list {
                 width: 195px;
                 width: 195px;
             }
             }
+
             .size-item {
             .size-item {
                 height: 20px;
                 height: 20px;
                 border: 1px solid #e8e8e8;
                 border: 1px solid #e8e8e8;
@@ -220,22 +221,26 @@ $hoverColor: #379ed6;
                 }
                 }
             }
             }
         }
         }
+
         .mr20 {
         .mr20 {
             margin-right: 20px;
             margin-right: 20px;
         }
         }
+
         .mr10 {
         .mr10 {
             margin-right: 10px;
             margin-right: 10px;
         }
         }
+
         .mb10 {
         .mb10 {
             margin-bottom: 10px;
             margin-bottom: 10px;
         }
         }
+
         .mb20 {
         .mb20 {
             margin-bottom: 20px;
             margin-bottom: 20px;
         }
         }
+
         .mb30 {
         .mb30 {
             margin-bottom: 30px;
             margin-bottom: 30px;
         }
         }
-
     }
     }
 
 
     .invalid-pros {
     .invalid-pros {

 .blk-cart-page {
 .blk-cart-page {
     .edit-color-size {
     .edit-color-size {
         position: absolute;
         position: absolute;
-        left: 180px;
+        left: 190px;
         width: 354px;
         width: 354px;
         border: 2px solid #bbb;
         border: 2px solid #bbb;
         top: -113px;
         top: -113px;