Authored by ccbikai

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

framework @ 75bbc3b0
Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
... ...
... ... @@ -197,6 +197,8 @@ if ($('.brand-search-page').length) {
$('<a href="' + content.searchHref + '">' + content.searchName + '</a>').appendTo('.historyList');
});
}
} else {
$('.history').css('display', 'none');
}
removeHistory = new Hammer($('.removeHistory')[0]);
... ...
... ... @@ -6,7 +6,7 @@
padding: 14rem / $pxConvertRem 3.125%;
background-color: #f8f8f8;
left: 0;
top: 88rem / $pxConvertRem;
top: 90rem / $pxConvertRem;
position: fixed;
z-index: 2;
... ...