fe / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 05d47a4c39e60c5e5c13aaae68fd4d4ffcdfc841 2 parents f6bfc0e0 ce57e3c8

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

Inline Side-by-side
Showing 3 changed files with 3 additions and 4 deletions
@@ -243,6 +243,4 @@ function scrollHandler() { @@ -243,6 +243,4 @@ function scrollHandler() {
243 } 243 }
244 244
245 //srcoll to load more 245 //srcoll to load more
246 -$(window).scroll(function() {  
247 - window.requestAnimationFrame(scrollHandler);  
248 -});  
  246 +$(window).scroll(scrollHandler);
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 width: pxToRem(472px); 72 width: pxToRem(472px);
73 height: pxToRem(88px); 73 height: pxToRem(88px);
74 line-height: pxToRem(88px); 74 line-height: pxToRem(88px);
75 - margin: pxToRem(125px) auto 0 auto; 75 + margin: pxToRem(80px) auto 0 auto;
76 background: #444; 76 background: #444;
77 text-align: center; 77 text-align: center;
78 color: #fff; 78 color: #fff;
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 overflow: hidden; 23 overflow: hidden;
24 } 24 }
25 .user-name { 25 .user-name {
  26 + float: left;
26 max-width: 240rem / $pxConvertRem; 27 max-width: 240rem / $pxConvertRem;
27 text-overflow:ellipsis; 28 text-overflow:ellipsis;
28 white-space:nowrap; 29 white-space:nowrap;