fe / YOHOBUYWAP · Commits

Go to a project

Authored by whb
Commit 51165e469333521591045475e47b3232bd206d2c 2 parents 58b0bc5b 416c8c37

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

Inline Side-by-side
Showing 2 changed files with 4 additions and 6 deletions
1 <div class="commodity clearfix" id="newarrivals"> 1 <div class="commodity clearfix" id="newarrivals">
2 {{> index/floor-header}} 2 {{> index/floor-header}}
3 3
4 - <div class="commodity-list">  
5 - <ul class="g-list clearfix">  
6 - </ul> 4 + <div class="goods-container clearfix">
7 </div> 5 </div>
8 <div class="loading"> 6 <div class="loading">
9 <a href="{{href}}">Loading...</a> 7 <a href="{{href}}">Loading...</a>
@@ -59,9 +59,7 @@ @@ -59,9 +59,7 @@
59 .tpl-keywords{ 59 .tpl-keywords{
60 margin-bottom: 8px; 60 margin-bottom: 8px;
61 } 61 }
62 - .tpl-category{  
63 - padding: 10px 0;  
64 - } 62 +
65 .tpl-category{ 63 .tpl-category{
66 padding: 10px 0; 64 padding: 10px 0;
67 background-color: #f8f8f8; 65 background-color: #f8f8f8;
@@ -113,6 +111,7 @@ @@ -113,6 +111,7 @@
113 margin-bottom:0px; 111 margin-bottom:0px;
114 } 112 }
115 .tpl-category{ 113 .tpl-category{
  114 + height: 192px;
116 a{ 115 a{
117 height: 32px; 116 height: 32px;
118 line-height: 32px; 117 line-height: 32px;
@@ -376,6 +375,7 @@ @@ -376,6 +375,7 @@
376 margin-bottom:0px; 375 margin-bottom:0px;
377 } 376 }
378 .tpl-category{ 377 .tpl-category{
  378 + height: 228px;
379 a{ 379 a{
380 height: 38px; 380 height: 38px;
381 line-height: 38px; 381 line-height: 38px;