Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -231,8 +231,8 @@
                                 <a href="\{{product_url}}">\{{product_name}}</a>
                             </p>
                             <p>
-                                颜色：<span title="\{{factory_goods_name}}">\{{factory_goods_name}}</span>
-                                尺码：\{{size_name}}
+                                颜色:<span title="\{{factory_goods_name}}">\{{factory_goods_name}}</span>
+                                尺码:\{{size_name}}
                             </p>
                         </div>
                         <div class="goods-price">

@@ -666,7 +666,7 @@ if ($miniCart && $miniCart.length) {
         $miniCart.html(_html);
         $goCart.addClass('on-hover');
     }, function() {
-        $goCart.removeClass('on-hover');
+        // $goCart.removeClass('on-hover');
     });
 
     $goCart.on('click', '.cart-goods-del', function() {

@@ -520,19 +520,20 @@
                 font-size: 16px;
                 color: #000;
                 line-height: 16px;
-                padding: 18px 26px;
+                margin: 0 26px;
+                padding: 18px 0;
                 border-bottom: 1px solid #dcdcdc;
             }
 
             .goods-list {
-                padding-top: 0;
-                margin-bottom: 15px;
+                padding-top: 5px;
+                padding-bottom:5px;
                 max-height: 368px;
                 overflow-x: hidden;
             }
 
             .goods-item {
-                padding: 0 0 8px 26px;
+                padding: 5px 0 5px 26px;
 
                 > div {
                     font-size: 14px;
@@ -541,21 +542,24 @@
                 }
 
                 p {
+                    font-size: 14px;
+                    color: #000;
                     margin-bottom: 12px;
                 }
 
                 .goods-img {
-                    width: 16px;
+                    width: 46px;
                 }
 
                 .goods-info {
+                    margin-left:16px;
                     width: 160px;
                     color: #b0b0b0;
 
                     span {
                         display: inline-block;
                         max-width: 50px;
-                        margin-right: 14px;
+                        margin-right: 10px;
                         overflow: hidden;
                         text-overflow: ellipsis;
                         white-space: nowrap;
@@ -566,9 +570,15 @@
                 .goods-price {
                     min-width: 90px;
                     text-align: right;
+                    p {
+                        &:nth-child(1) {
+                           margin-top: 8px
+                        }
+                    }
                 }
 
                 .title {
+                    margin-top: 8px;
                     width: 160px;
                     height: 14px;
                     font-size: 14px;
@@ -576,17 +586,22 @@
                     text-overflow: ellipsis;
                     white-space: nowrap;
                     overflow: hidden;
+                    &+p {
+                        margin-bottom: 0;
+                        color: #b0b0b0;
+                    }
                 }
 
                 .title > a {
-                    color: #666;
+                    color: #444;
                 }
             }
 
             .activity-item {
                 font-size: 14px;
+                margin-top:5px;
                 margin-bottom: 8px;
-                padding-left: 18px;
+                padding-left: 26px;
                 line-height: 18px;
 
                 label {
@@ -615,7 +630,7 @@
                 > div {
                     height: 88px;
                     border-top: 1px solid #dcdcdc;
-                    text-align: left;
+                    text-align: right;
                 }
                 p {
                     font-size: 13px;