Authored by Rock Zhang

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

... ... @@ -162,10 +162,12 @@
}
.btn-wrap {
position: relative;
height: 120rem / $pxConvertRem;
border-top: 1px solid #e6e6e6;
padding: 20rem / $pxConvertRem;
text-align: center;
background: #fff;
box-sizing: border-box;
.btn-sure {
... ...
... ... @@ -4,9 +4,9 @@
padding-left: 16rem / $pxConvertRem;
.prevent-img-click {
position: absolute;
width: 20rem / $pxConvertRem;
height: 200rem / $pxConvertRem;
position: absolute;
background-color: transparent;
z-index: 99;
}
... ...
... ... @@ -119,13 +119,13 @@
}
.coupon-use {
box-sizing: border-box;
@include box-sizing(border-box);
position: relative;
float: right;
padding-right: 30rem / $pxConvertRem;
color: #999;
text-align: right;
width: 360rem / $pxConvertRem;
width: 320rem / $pxConvertRem;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
... ... @@ -137,7 +137,7 @@
color: #999;
}
}
.checkbox {
display: inline-block;
width: 80rem / $pxConvertRem;
... ...
... ... @@ -6,6 +6,7 @@
margin-bottom: pxToRem(30px);
padding-left: pxToRem(30px);
padding-right: pxToRem(30px);
font-size: pxToRem(24px);
input {
padding: 0 pxToRem(12px);
... ...
.recommend-for-you {
padding: pxToRem(30px) 0 pxToRem(10px);
padding: pxToRem(30px) 0 pxToRem(30px);
border-top: 1px solid #e0e0e0;
border-bottom: 1px solid #e0e0e0;
background: #fff;
... ... @@ -45,11 +45,13 @@
line-height: 1;
.sale-price {
display: block;
color: #d9134f;
margin-right: pxToRem(8px);
}
.old-price {
display: block;
color: #b0b0b0;
text-decoration: line-through;
}
... ...
... ... @@ -15,9 +15,7 @@
{{# navBtn}}
<!-- <span class="nav-btn">{{.}}</span> -->
<!-- <i class="iconfont nav-home">&#xe638;</i> -->
{{/ navBtn}}
</header>
<div class="homebuttom none">
<!-- <div class="homebuttom none">
<ul>
<li>
<i class="iconfont">&#xe62a;</i>
... ... @@ -36,5 +34,8 @@
<span>我的</span>
</li>
</ul>
</div>
</div> -->
{{/ navBtn}}
</header>
{{/pageHeader}}
... ...