Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy.git into develop

@@ -5,8 +5,10 @@
         <div class="sort-container">
         <div class="sort-container">
             <ul class="sort-child-list new-sale">
             <ul class="sort-child-list new-sale">
                 <li>
                 <li>
+                    <h2>
                         <a href="{{href}}">全部折扣</a>
                         <a href="{{href}}">全部折扣</a>
                         <span>{{updateNum}}</span>
                         <span>{{updateNum}}</span>
+                    </h2>
                 </li>
                 </li>
                 {{#each list}}
                 {{#each list}}
                     <li {{#if active}}class="active"{{/if}}>
                     <li {{#if active}}class="active"{{/if}}>

@@ -9,6 +9,7 @@
         &:first-child {
         &:first-child {
             border-top: none;
             border-top: none;
             background: #eaeceb;
             background: #eaeceb;
+            padding: 5px 15px;
         }
         }
     }
     }
 
 
@@ -58,11 +59,15 @@
     .checked-conditions {
     .checked-conditions {
         line-height: 30px;
         line-height: 30px;
 
 
+        .title {
+            margin-top: 5px;
+        }
+
         .tag {
         .tag {
             display: block;
             display: block;
             float: left;
             float: left;
             padding: 0 10px;
             padding: 0 10px;
-            margin-right: 30px;
+            margin: 5px 30px 5px 0;
             background: #000;
             background: #000;
             color: #fff;
             color: #fff;
             cursor: pointer;
             cursor: pointer;
@@ -76,6 +81,7 @@
         }
         }
 
 
         .clear-checked {
         .clear-checked {
+            margin-top: 5px;
             color: #999;
             color: #999;
             float: right;
             float: right;
         }
         }

@@ -73,6 +73,12 @@
                 &.new-sale {
                 &.new-sale {
                     display: block;
                     display: block;
                 }
                 }
+
+                h2 a {
+                    color: #000;
+                    padding-left: 0;
+                }
+
                 li {
                 li {
                     color: #bbb;
                     color: #bbb;
 
 
@@ -80,6 +86,7 @@
                         padding-left: 5px;
                         padding-left: 5px;
                     }
                     }
                 }
                 }
+
                 a {
                 a {
                     color: #666;
                     color: #666;
                     padding-left: 10px;
                     padding-left: 10px;