Authored by xuqi

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

... ... @@ -22,9 +22,10 @@
color: #444;
.more-btn{
position: absolute;
right: 30rem / $pxConvertRem;
right: 0.75rem;
top: 0;
bottom: 0;
color: #b0b0b0;
font-size: 1.25rem;
}
}
\ No newline at end of file
... ...
... ... @@ -40,11 +40,12 @@
.goods-category .category-list {
background: #f5f7f6;
height: 383rem / $pxConvertRem;
border-bottom: 1px solid #e0e0e0;
overflow: hidden;
li {
float: left;
width: 191rem / $pxConvertRem;
height: 181rem / $pxConvertRem;
height: 191rem / $pxConvertRem;
border-left: 1px solid #e0e0e0;
.first-show {
... ...
... ... @@ -41,7 +41,7 @@
}
.load-more-info {
width: 100%;
height: 570rem / $pxConvertRem;
height: 70rem / $pxConvertRem;
line-height: 70rem / $pxConvertRem;
text-align: center;
font-size: 14px;
... ...