Authored by hf

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

... ... @@ -140,7 +140,7 @@ function reMarginFooter(fixedElement) {
//已登录
$op.prepend(
'Hi,' +
'<span>Hi,</span>' +
'<a class="user-name" href="http://m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
'<a href="http://m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>'
);
... ...
... ... @@ -7,11 +7,21 @@
padding: 0 15px;
height: 60px;
line-height: 60px;
span{
display: inline-block;
overflow:hidden;
}
a{
display: inline-block;
overflow:hidden;
}
.user-name {
text-decoration: underline;
margin-left: .3em;
margin-right: 1em;
max-width: 200rem / $pxConvertRem;
text-overflow:ellipsis;
white-space:nowrap;
}
.back-to-top {
... ...