Authored by whb

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

... ... @@ -166,19 +166,21 @@ if ($('.brand-search-page').length) {
$keyword.on('input', function() {
if ($keyword.val().length) {
$icon.css('color', '#000');
$(this).closest('.search-box').css('width', '11.25rem');
$icon.css('color', '#444');
// $(this).closest('.search-box').css('width', '11.25rem');
$searchAction.show().find('.clear-text').show();
} else {
$icon.css('color', '#b2b2b2');
$(this).closest('.search-box').css('width', '12.5rem');
$searchAction.hide();
// $(this).closest('.search-box').css('width', '12.5rem');
$searchAction.find('.clear-text').hide();
}
searchResult();
}).focus();
// 2016.1.13 产品(高扬)要求进入页面默认显示取消按钮
$icon.css('color', '#000');
$icon.css('color', '#444');
$keyword.closest('.search-box').css('width', '11.25rem');
$searchAction.show().find('.clear-text').hide();
... ...
... ... @@ -202,7 +202,7 @@
li:before {
content: "";
display: inline-block;
margin-right: 20rem / $pxConvertRem;
margin-right: 10rem / $pxConvertRem;
width: 8rem / $pxConvertRem;
height: 8rem / $pxConvertRem;
background-color: #000;
... ...
... ... @@ -129,6 +129,7 @@
display: inline;
font-size: 28rem / $pxConvertRem;
vertical-align: middle;
color: #444;
}
.clear-text {
... ...
... ... @@ -248,6 +248,12 @@
.slide-wrapper {
height: 100%;
li {
a {
width: 100%;
}
}
}
.slide-switch {
... ...