修改品牌搜索字体大小

阿达
Commit b03981d43bedd0cf09689f986819524bb04ecb96 1 parent 6358d686
Showing 8 changed files with 44 additions and 40 deletions
static/font/iconfont.eot
static/font/iconfont.svg
static/font/iconfont.ttf
static/font/iconfont.woff
static/js/category/brand.js
static/js/category/write-search.js
static/sass/category/_brand.css
template/m.yohobuy.com/actions/category/brand/search.phtml
--- a/static/font/iconfont.eot
View file @b03981d
+++ b/static/font/iconfont.eot
View file @b03981d
--- a/static/font/iconfont.svg
View file @b03981d
+++ b/static/font/iconfont.svg
View file @b03981d
@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Fri May 13 13:48:36 2016
+Created by FontForge 20120731 at Mon May 16 09:39:59 2016
  By admin
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Fri May 13 13:48:36 2016
     bbox="-0.75 -128 3943 896.75"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E64B"
+    unicode-range="U+0078-E64C"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -279,5 +279,9 @@ d="M379 -128q-57 0 -122 51.5t-97 132.5q-26 71 -27 149.5t24 151.5q11 33 32.5 70.5
 t42.5 -126.5q4 -5 9 -17t8 -17q51 -89 55 -157q4 -63 -14.5 -126.5t-65.5 -120t-115 -80.5q-30 -11 -61 -11q-18 0 -30.5 5t-18 12.5t-7.5 13t-2 10.5q0 7 2 13t4 10t7.5 9.5t7.5 7t9 6.5t8 6l3 3q36 26 54 75.5t7 95.5q-4 28 -27 75q-2 6 -7.5 20t-8.5 22t-6.5 20t-4.5 23
 q0 -2 -2 -5t-2 -5q-15 -42 -20 -75q0 -45 7 -58q7 -5 7.5 -14.5t-4.5 -16.5q-5 -8 -14 -10t-17 3v0q-67 44 -85 120q7 34 7 78v21v24q0 68 -10 92q-14 -53 -28 -72q-22 -39 -37 -58q-6 -6 -15.5 -20t-12.5 -18q-13 -22 -24 -46.5t-21.5 -61.5t-5.5 -78t28 -76
 q3 -7 7.5 -12.5t8 -10t8.5 -10t7.5 -8t8 -7t7.5 -6.5t7.5 -6.5t6.5 -4.5q11 -9 16.5 -14.5t10 -14.5t0.5 -19q-5 -18 -21.5 -29.5t-39.5 -11.5z" />
+    <glyph glyph-name="uniE64C" unicode="&#xe64c;" 
+d="M911 725h-242v123q0 21 -13.5 34.5t-34.5 13.5h-246q-20 0 -33.5 -13.5t-13.5 -34.5v-123h-246q-21 0 -34.5 -13.5t-13.5 -34t13.5 -34t34.5 -13.5h293h243h293q21 0 34.5 13.5t13.5 34t-13.5 34t-34.5 13.5zM423 725v72h147v-72h-147zM765 579q-21 0 -34.5 -14
+t-13.5 -34v-560h-441v560q0 20 -13.5 34t-34 14t-34 -14t-13.5 -34v-611q0 -21 13.5 -34.5t34.5 -13.5h536q20 0 33.5 13.5t13.5 34.5v611q3 20 -11.5 34t-35.5 14zM447 67v389q0 20 -13.5 33.5t-34 13.5t-34 -13.5t-13.5 -33.5v-389q0 -21 13.5 -34.5t34 -13.5t34 13.5
+t13.5 34.5zM645 67v389q0 20 -13.5 33.5t-34.5 13.5q-20 0 -35.5 -13.5t-15.5 -33.5v-389q0 -21 13.5 -34.5t34.5 -13.5t36 13.5t15 34.5z" />
   </font>
 </defs></svg>
--- a/static/font/iconfont.ttf
View file @b03981d
+++ b/static/font/iconfont.ttf
View file @b03981d
--- a/static/font/iconfont.woff
View file @b03981d
+++ b/static/font/iconfont.woff
View file @b03981d
--- a/static/js/category/brand.js
View file @b03981d
+++ b/static/js/category/brand.js
View file @b03981d
@@ -183,7 +183,7 @@ function searchResult() {
     writeSearch.bindWirteLocal($brandList);
 }
-if ($('.brand-search-page').length) {
+if ($('.brand-search-page').length > 0) {
     brandsData = $.parseJSON($('#brands-data').html());
     $keyword = $('#keyword');
@@ -281,41 +281,40 @@ if ($('.brand-search-page').length >0) {
     });
     //搜索页面
-    if ($('.brand-search-page').length > 0){
-        (function () {
-            var html = '',
-                history,
-                historys, i,
-                brand, url, locate;
-
-            if (localStorage) {
-                historys = localStorage.getItem('historys-brand');
-
-                if (historys && historys.length > 0) {
-                    historys = historys.split(ranToken);
-                    for (i = (historys.length >= 10) ? 10 : historys.length; i > 0; i--) {
-                        history = historys[i - 1];
-
-                        if (history === '') {
-                            continue;
-                        }
-                        locate = history.indexOf("http://");
-                        brand = history.substr(0, locate);
-                        url = history.substr(locate, history.length - locate);
-
-                        html += '<li><a href="' + url + '">' + brand + '</li>';
-                        $historySearch.removeClass('hide');
-                    }
-                    $history.html(html);
-                    $clearHistory.removeClass('hide');
+    (function () {
+        var html = '',
+            history,
+            historys, i,
+            brand, url, locate;
+
+        if (localStorage) {
+            historys = localStorage.getItem('historys-brand');
+
+            if (historys && historys.length > 0) {
+                historys = historys.split(ranToken);
+                for (i = (historys.length >= 10) ? 10 : historys.length; i > 0; i--) {
+                    history = historys[i - 1];
+
+                    if (history === '') {
+                        continue;
+                    }
+                    locate = history.indexOf("http://");
+                    brand = history.substr(0, locate);
+                    url = history.substr(locate, history.length - locate);
-                    $hotSearch.removeClass('hide');
-                    window.rePosFooter();
+                    html += '<li><a href="' + url + '">' + brand + '</li>';
+                    $historySearch.removeClass('hide');
                 }
+
+                $history.html(html);
+                $clearHistory.removeClass('hide');
+
+                $hotSearch.removeClass('hide');
+                window.rePosFooter();
             }
-        }());
-    }
+        }
+    }());
 }
--- a/static/js/category/write-search.js
View file @b03981d
+++ b/static/js/category/write-search.js
View file @b03981d
@@ -16,7 +16,7 @@ function getRanToken() {
 function bindWirteLocal($brandList) {
     $brandList.on('click','p', function(e) {
-        var a,brandName,brandId,url,query;
+        var a,brandName,brandId,url;
         e.preventDefault();
@@ -28,7 +28,7 @@ function bindWirteLocal($brandList) {
         url = a.attr("href");
-        query = brandName+url,
+        var query = brandName+url,
             historys;
         if (localStorage) {
--- a/static/sass/category/_brand.css
View file @b03981d
+++ b/static/sass/category/_brand.css
View file @b03981d
@@ -314,10 +314,12 @@
     }
     .brand-name{
+        margin-top: 10px;
         text-align: center;
         vertical-align: middle;
-        font-size: 26px;
+        font-size: 24px;
         line-height: 44px;
+        height: 44px;
         color: #b8b8b8;
     }
@@ -351,7 +353,6 @@
     }
     .search-result {
-        padding-top: 64px;
-        display: block;
+        padding-top: 165px;
     }
 }
--- a/template/m.yohobuy.com/actions/category/brand/search.phtml
View file @b03981d
+++ b/template/m.yohobuy.com/actions/category/brand/search.phtml
View file @b03981d
@@ -19,7 +19,7 @@
         {{#if historySearch}}
         <div class="history-search net-search hide">
             <h3><span class="iconfont">&#xe64a;</span>最近搜索
-                <button id="clear-history" class="clear-icon iconfont hide">&#xe621;</button>
+                <button id="clear-history" class="clear-icon iconfont hide">&#xe64c;;</button>
             </h3>
             <ul class="history clearfix">
                 {{# history}}