search/list brand adaption

@@ -102,16 +102,20 @@
                         </div>
                         </div>
                     </div>
                     </div>
 
 
-                    <ul class="panel-body check-container clearfix">
-                        {{# brandsShow}}
-                            <li class="attr" data-index="{{index}}" data-key="{{key}}">
-                                <a href="{{href}}">
-                                    <span class="iconfont checkbox" data-id="{{id}}">&#xe613;</span>
-                                    <span title="{{name}}">{{name}}</span>
-                                </a>
-                            </li>
-                        {{/ brandsShow}}
-                    </ul>
+                    <div class="panel-body">
+                        <div class="ul-scroll">
+                            <ul class="check-container clearfix">
+                                {{# brandsShow}}
+                                    <li class="attr" data-index="{{index}}" data-key="{{key}}">
+                                        <a href="{{href}}">
+                                            <span class="iconfont checkbox" data-id="{{id}}">&#xe613;</span>
+                                            <span title="{{name}}">{{name}}</span>
+                                        </a>
+                                    </li>
+                                {{/ brandsShow}}
+                            </ul>
+                        </div>
+                    </div>
 
 
                     <div class="btns">
                     <div class="btns">
                         <button id="brand-multi-ok" class="multi-select-ok dis">确定</button>
                         <button id="brand-multi-ok" class="multi-select-ok dis">确定</button>

@@ -14,16 +14,12 @@
 
 
     .title {
     .title {
         float: left;
         float: left;
-        width: 90px;
+        width: 75px;
         line-height: 30px;
         line-height: 30px;
     }
     }
 
 
     .attr-content {
     .attr-content {
-        margin-left: 90px;
-
-        .default {
-            padding-right: 140px;
-        }
+        margin-left: 75px;
     }
     }
 
 
     .multi-select {
     .multi-select {
@@ -120,16 +116,17 @@
         }
         }
 
 
         .brand-more {
         .brand-more {
-            margin-right: 20px;
+            margin-right: 10px;
             cursor: pointer;
             cursor: pointer;
         }
         }
 
 
         .brands-index {
         .brands-index {
             float: left;
             float: left;
             line-height: 30px;
             line-height: 30px;
+            margin-right: 5px;
 
 
             span {
             span {
-                margin: 0 5px;
+                margin: 0 2px;
                 cursor: pointer;
                 cursor: pointer;
                 -moz-user-select: none;
                 -moz-user-select: none;
 
 
@@ -145,7 +142,7 @@
             line-height: 18px;
             line-height: 18px;
             border: 1px solid #b0b0b0;
             border: 1px solid #b0b0b0;
             margin-top: 5px;
             margin-top: 5px;
-            margin-left: 15px;
+            margin-left: 10px;
 
 
             input {
             input {
                 float: left;
                 float: left;
@@ -159,7 +156,7 @@
                 display: inline-block;
                 display: inline-block;
                 width: 55px;
                 width: 55px;
                 height: 18px;
                 height: 18px;
-                background: #b0b0b0;
+                background: #3a3a3a;
                 color: #fff;
                 color: #fff;
                 text-align: center;
                 text-align: center;
                 cursor: default;
                 cursor: default;
@@ -168,10 +165,15 @@
 
 
         .panel-body {
         .panel-body {
             padding: 15px 20px;
             padding: 15px 20px;
-            margin-top: 5px;
             background: #f4f7f6;
             background: #f4f7f6;
-            min-height: 30px;
-            border: 1px solid #000;
+            margin-top: 5px;
+            margin-left: 10px;
+
+            .ul-scroll {
+                overflow: auto;
+                min-height: 30px;
+                max-height: 150px;
+            }
         }
         }
     }
     }
 
 
@@ -300,4 +302,4 @@
     .multi .checkbox {
     .multi .checkbox {
         display: inline;
         display: inline;
     }
     }
-}
+}

-@import "search", "list", "new-sale", "filter-box", "sort-pager", "good", "latest-walk", "left-content", "no-result", "hot-rank";
+@import "search", "list", "new-sale", "filter-box", "sort-pager", "good", "latest-walk", "left-content", "no-result", "hot-rank", "shop-entry";
 
 
 .product-page {
 .product-page {
 
 
@@ -44,6 +44,14 @@
             height: 315px;
             height: 315px;
         }
         }
     }
     }
+
+    .panel-body .attr {
+        width: 25%;
+    }
+
+    .filter-box .brand .attr-content {
+        max-width: 730px;
+    }
 }
 }
 
 
 /*990px*/
 /*990px*/
@@ -74,5 +82,9 @@
                 height: 261px;
                 height: 261px;
             }
             }
         }
         }
+
+        .filter-box .brand .attr-content {
+            max-width: 570px;
+        }
     }
     }
 }
 }

@@ -148,6 +148,4 @@
             color: #f00;
             color: #f00;
         }
         }
     }
     }
-
-    @import "shop-entry";
 }
 }

@@ -5,7 +5,6 @@
  */
  */
 
 
 .product-search-page {
 .product-search-page {
-    @import "shop-entry";
     .goods-container {
     .goods-container {
         height: auto;
         height: auto;
         padding: 25px 0 0 0;
         padding: 25px 0 0 0;
@@ -22,7 +21,6 @@
 /*990px*/
 /*990px*/
 @media (max-width: 1180px) {
 @media (max-width: 1180px) {
     .product-search-page {
     .product-search-page {
-
         .goods-container {
         .goods-container {
             height: auto;
             height: auto;
             padding-top: 25px;
             padding-top: 25px;
@@ -42,5 +40,9 @@
                 height: 255px;
                 height: 255px;
             }
             }
         }
         }
+
+        .filter-box .brand .attr-content {
+            max-width: 750px;
+        }
     }
     }
 }
 }