Merge branch 'develop'

@@ -17,8 +17,6 @@ var $icon = $('.search-icon');
 var searchH = $('.newbrand-search').outerHeight(),
     headerH = $('.yoho-header').outerHeight(),
     brandSwipe = parseInt(searchH) + parseInt(headerH) - 1,
-    minBrandListTop,
-    searchArray = [],
     minBrandListTop;
 
 var brandsData,
@@ -119,7 +117,6 @@ if ($('.brand-search-page').length) {
     $keyword = $('#keyword');
 
     $keyword.on('input', function() {
-        $('.history').css('display', 'none');
         if ($keyword.val().length) {
             searchResult();
             $icon.css('color', '#000');
@@ -135,6 +132,7 @@ if ($('.brand-search-page').length) {
     clearTextHammer = new Hammer($('.clear-text')[0]);
     clearTextHammer.on('tap', function(e) {
         e.preventDefault();
+        $('.search-result').html('');
         $('#keyword').val('').trigger('input');
         e.srcEvent.stopPropagation();
     });
@@ -142,4 +140,5 @@ if ($('.brand-search-page').length) {
     $('form.search-box').on('submit', function() {
         return false;
     });
+
 }

@@ -38,7 +38,7 @@
             left: 515rem / $pxConvertRem;
             border: none;
             background: transparent;
-            color: #b2b2b2;
+            color: #000;
             font-size: 30rem / $pxConvertRem;
             line-height: 56rem / $pxConvertRem;
         }

@@ -13,7 +13,7 @@
 
         input {
             height: 30px;
-            width: 90%;
+            width: 95%;
             border-radius: 15px;
             text-indent: 26px;
             background: #fff;
@@ -29,7 +29,7 @@
         .search {
             position: absolute;
             top: 12px;
-            right: 0;
+            right: .4rem;
             border: none;
             background: transparent;
             font-size: 16px;