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

@@ -106,7 +106,7 @@
                         {{# brands}}
                         {{# brands}}
                         <div class="brand">
                         <div class="brand">
                             <a class="thumb" href="{{url}}" target="_blank">
                             <a class="thumb" href="{{url}}" target="_blank">
-                                <img src="{{thumb}}">
+                                <img src="{{image thumb 100 100 2}}">
                             </a>
                             </a>
                             <p class="brand-name">{{name}}</p>
                             <p class="brand-name">{{name}}</p>
                         </div>
                         </div>

@@ -193,7 +193,6 @@ a {
     font-size: 24px;
     font-size: 24px;
     font-family: "iconfont" !important;
     font-family: "iconfont" !important;
     -webkit-font-smoothing: antialiased;
     -webkit-font-smoothing: antialiased;
-    -webkit-text-stroke-width: 0.4px;
     -moz-osx-font-smoothing: grayscale;
     -moz-osx-font-smoothing: grayscale;
 }
 }
 
 

@@ -91,7 +91,7 @@
             }
             }
         }
         }
 
 
-        .mini-bag-box-wrap{
+        .mini-bag-box-wrap {
             display: none;
             display: none;
         }
         }
 
 
@@ -298,14 +298,14 @@
     }
     }
 
 
     .sub-nav {
     .sub-nav {
-        height: 50px;
+        height: 44px;
         background: #1b1b1b;
         background: #1b1b1b;
 
 
         .sub-nav-list {
         .sub-nav-list {
             max-width: 94%;
             max-width: 94%;
             display: inline-block;
             display: inline-block;
-            line-height: 55px;
-            height: 44px;
+            line-height: 50px;
+            font-size: 14px;
 
 
             li {
             li {
                 float: left;
                 float: left;
@@ -417,6 +417,7 @@
         left: 0;
         left: 0;
         display: none;
         display: none;
         z-index: 10;
         z-index: 10;
+        top: 180px;
 
 
         dl {
         dl {
             float: left;
             float: left;

@@ -310,7 +310,7 @@
 
 
         .goods {
         .goods {
             margin: 10px 0 16px;
             margin: 10px 0 16px;
-            padding: 10px 13px;
+            padding: 10px;
             float: left;
             float: left;
             text-align: center;
             text-align: center;
             border: 2px solid #fff;
             border: 2px solid #fff;
@@ -318,7 +318,6 @@
             width: 289px;
             width: 289px;
 
 
             .goods-brand {
             .goods-brand {
-                font-weight: 700;
                 padding: 10px 10px 4px;
                 padding: 10px 10px 4px;
                 overflow: hidden;
                 overflow: hidden;
                 text-overflow: ellipsis;
                 text-overflow: ellipsis;
@@ -380,7 +379,6 @@
             background: #fff;
             background: #fff;
             z-index: 2;
             z-index: 2;
             top: 10px;
             top: 10px;
-            padding-right: 10px;
             min-width: 383px;
             min-width: 383px;
             display: none;
             display: none;
 
 
@@ -390,7 +388,7 @@
             }
             }
 
 
             .goods-img-list {
             .goods-img-list {
-                margin: 2px 0 2px 10px;
+                margin: 0 10px 2px 4px;
                 float: left;
                 float: left;
 
 
                 .goods-img-col {
                 .goods-img-col {
@@ -401,12 +399,16 @@
                 }
                 }
 
 
                 .goods-img-col:last-child {
                 .goods-img-col:last-child {
-                    margin-right: 0;
+                    margin-right: 10px;
                 }
                 }
 
 
                 img {
                 img {
-                    margin-top: 11px;
+                    margin-top: 10px;
                     cursor: pointer;
                     cursor: pointer;
+
+                    &:nth-child(4n) {
+                        margin-top: 11px;
+                    }
                 }
                 }
             }
             }
         }
         }