Authored by 毕凯

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

... ... @@ -243,6 +243,4 @@ function scrollHandler() {
}
//srcoll to load more
$(window).scroll(function() {
window.requestAnimationFrame(scrollHandler);
});
\ No newline at end of file
$(window).scroll(scrollHandler);
\ No newline at end of file
... ...
... ... @@ -72,7 +72,7 @@
width: pxToRem(472px);
height: pxToRem(88px);
line-height: pxToRem(88px);
margin: pxToRem(125px) auto 0 auto;
margin: pxToRem(80px) auto 0 auto;
background: #444;
text-align: center;
color: #fff;
... ...
... ... @@ -23,6 +23,7 @@
overflow: hidden;
}
.user-name {
float: left;
max-width: 240rem / $pxConvertRem;
text-overflow:ellipsis;
white-space:nowrap;
... ...