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

@@ -14,6 +14,7 @@ var swiper,
     $brandText,
     $brandText,
     $brandHref,
     $brandHref,
     $brandList = $('.brand-list');
     $brandList = $('.brand-list');
+var $icon = $('.search-icon');
 
 
 var searchH = $('.newbrand-search').outerHeight(),
 var searchH = $('.newbrand-search').outerHeight(),
     headerH = $('.yoho-header').outerHeight(),
     headerH = $('.yoho-header').outerHeight(),
@@ -142,9 +143,11 @@ if ($('.brand-search-page').length) {
         $('.history').css('display', 'none');
         $('.history').css('display', 'none');
         if ($keyword.val().length) {
         if ($keyword.val().length) {
             searchResult();
             searchResult();
+            $icon.css('color', '#000');
             $(this).closest('.search-box').css('width', '11.25rem');
             $(this).closest('.search-box').css('width', '11.25rem');
             $('.search-action').show();
             $('.search-action').show();
         } else {
         } else {
+            $icon.css('color', '#b2b2b2');
             $(this).closest('.search-box').css('width', '12.5rem');
             $(this).closest('.search-box').css('width', '12.5rem');
             $('.search-action').hide();
             $('.search-action').hide();
         }
         }

@@ -11,6 +11,8 @@ var $input = $('#search-input input');
 
 
 var $clear = $('#search-input .clear-input');
 var $clear = $('#search-input .clear-input');
 
 
+var $icon = $('.search-icon');
+
 var $form = $('#search-form');
 var $form = $('#search-form');
 
 
 var $history = $('.history');
 var $history = $('.history');
@@ -32,8 +34,10 @@ chHammer.on('tap', function() {
 
 
 $input.on('input', function() {
 $input.on('input', function() {
     if ($input.val() === '') {
     if ($input.val() === '') {
+        $icon.css('color', '#b2b2b2');
         $clear.addClass('hide');
         $clear.addClass('hide');
     } else {
     } else {
+        $icon.css('color', '#000');
         $clear.removeClass('hide');
         $clear.removeClass('hide');
     }
     }
 });
 });

@@ -44,7 +44,8 @@
                 border: none;
                 border: none;
                 width: 95%;
                 width: 95%;
                 height: 60rem / $pxConvertRem;
                 height: 60rem / $pxConvertRem;
-                line-height: 1;
+                line-height: 60rem / $pxConvertRem;
+                font-size: 1.2em;
                 padding: 0 10rem / $pxConvertRem;
                 padding: 0 10rem / $pxConvertRem;
             }
             }
 
 

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