Authored by htoooth

Merge remote-tracking branch 'origin/feature/new-product-detail' into feature/new-product-detail

... ... @@ -8,7 +8,7 @@
<a href="{{url}}" class="pkg-proImg"><img src="{{image src 85 109}}" class="pro-img"/></a>
<div class="type-chose">
<div class="chose-color row clearfix">
<span class="title pull-left">&nbsp;&nbsp;色:</span>
<span class="title pull-left">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;色:</span>
<ul class="pkg-colors colors pull-left clearfix">
{{#each colors}}
<li class="{{#if focus}}focus{{/if}} {{#unless total}}disable{{/unless}} pull-left"
... ... @@ -19,7 +19,7 @@
</ul>
</div>
<div class="chose-size row clearfix">
<span class="title pull-left">&nbsp;&nbsp;码: </span>
<span class="title pull-left">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码: </span>
<div class="pkg-sizes size-wrapper pull-left">
{{> pkg-size}}
... ... @@ -44,7 +44,7 @@
{{/packageData}}
</div>
<div class="pkgDg-footer clearfix">
<p class="totalMoney left">计:<em>{{pkgPrice}}</em></p>
<p class="totalMoney left">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;计:<em>¥{{pkgPrice}}</em></p>
<span id="pay-pkg" class="buy-product red-color right">
<em>立即购买</em>
</span>
... ...
... ... @@ -920,7 +920,7 @@
}
.red-color {
color: #d42838;
color: #d0021b;
}
}
... ... @@ -2459,7 +2459,7 @@
width: 500px;
max-height: 680px;
padding: 20px 20px 0 20px;
border-color: rgba(0,0,0,.7);
border-color: rgba(0,0,0,.6);
.pkg-close {
position: relative;
... ... @@ -2470,12 +2470,15 @@
.pkg-close .iconfont {
font-size: 35px;
line-height: 40px;
font-weight: normal;
}
.pkgDg-header {
height: 50px;
line-height: 50px;
text-align: left;
font-size: 16px;
font-weight: 600;
}
.pkgDg-prodetal {
... ... @@ -2501,13 +2504,22 @@
}
}
.chose-color .title {
font-size: 13px;
}
.chose-size .title {
margin-top: 6px;
}
.type-chose {
float: left;
width: 350px;
margin-left: 15px;
.pkg-colors, .pkg-sizes {
width: 306px;
width: 285px;
font-size: 13px;
}
}
... ... @@ -2516,7 +2528,7 @@
}
.chose-done {
font-size: 12px;
font-size: 13px;
text-align: left;
.pkg-size {
... ... @@ -2538,7 +2550,8 @@
bottom: 0;
.totalMoney em {
color: #d42838;
color: #d0021b;
font-size: 20px;
font-weight: bold;
}
... ...