fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 8c3437ac5322d899da29b5240bc816a5785a38f4 2 parents 87032f46 d1a9e5f3

Merge branch 'feature/new-product-detail' of http://git.yoho.cn/fe/yohobuy-node … 

…into feature/new-product-detail
Inline Side-by-side
Showing 3 changed files with 62 additions and 29 deletions
... ... @@ -36,8 +36,8 @@
<div class="other-infos">
<div class="description-material info-block">
<p class="block-title">
<span class="title cur">商品信息 Product Info</span>
<p class="block-title"id="block-title-head">
<span class="title cur">商品信息</span>
</p>
<div class="description-content">
... ... @@ -72,12 +72,13 @@
</div>
<div class="description-material info-block">
<p class="block-title">
<span class="title cur">材质洗涤 Washing Instructions</span>
<span class="title cur">材质洗涤</span>
</p>
<div class="material-content">
<div class="material-content">
{{# material}}
{{#if materialDetail}}
<ul class="material-detail">
... ... @@ -106,7 +107,7 @@
</div>
<div class="description-material-tab info-block">
<p class="block-title">
<span class="title cur">尺码信息 Size Guide</span>
<span class="title cur">尺码信息</span>
</p>
<div class="size-content">
... ...
{{#each comments}}
<li>
<div class="user-info clearfix">
<img class="user-avatar" src="{{avatar}}">
<div class="user-info clearfix judge-head">
<!-- <img class="user-avatar" src="{{avatar}}"> -->
<span class="name">{{userName}}</span>
<span class="comment-star pull-left">
<span class="star-{{star}} active"></span>
</span>
</div>
<dl class="pull-right">
{{#if color}}<dd>颜色：{{color}}</dd>{{/if}}
... ... @@ -15,21 +20,14 @@
{{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}
</dd>
</dl>
<!-- <div style="clear:both"></div> -->
<div class="comment-detail">
<div class="tag-list clearfix">
<!-- <div class="tag-list clearfix">
<span class="comment-star pull-left">
<span class="star-{{star}} active"></span>
</span>
<dl class="horizontal-list pull-right">
<dd>尺码符合度：
{{#if_cond comfort "===" "MIDDLE"}}合适{{/if_cond}}
{{#if_cond comfort "===" "SMALL"}}偏小{{/if_cond}}
{{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}
</dd>
<dd>{{#if height}}身高：{{height}} 厘米{{/if}}</dd>
<dd>{{#if weight}}体重：{{weight}} 公斤{{/if}}</dd>
</dl>
</div>
</div> -->
<p class="comment">{{comment}}</p>
... ...
... ... @@ -798,14 +798,21 @@
}
}
.info-bootom{
.info-bootom {
margin-top: 0px;
}
.block-title {
margin-bottom: 25px;
#block-title-head {
margin-top: 20px;
margin-bottom: 25px;
}
.block-title {
margin-bottom: 44px;
margin-top: -18px;
text-align: center;
.title {
display: inline-block;
padding-top: 15px;
... ... @@ -814,10 +821,15 @@
font-size: 18px;
margin-left: auto;
margin-right: auto;
&.cur {
color: #222;
border-top: 2px solid #222;
margin-top: -2px;
/*border-top: 2px solid #222;*/
/*margin-top: -2px;*/
border: 1px solid #000;
padding: 8px 26px;
text-align: center;
background-color: #fff;
}
}
... ... @@ -1074,6 +1086,7 @@
li {
border-top: 1px solid #eaeceb;
padding: 20px 0;
min-height: 150px;
}
.user-info {
... ... @@ -1095,6 +1108,8 @@
.question {
color: #222;
}
}
.user-avatar {
... ... @@ -1104,8 +1119,8 @@
}
.comment-detail{
margin-left:120px;
margin-right:120px;
margin-left:30px;
/*margin-right:120px;*/
.tag-list{
height:24px;
... ... @@ -1214,6 +1229,8 @@
.comment {
margin-bottom:10px;
line-height: 1.5;
font-size: 14px;
color: #000;
}
/*.consults {
... ... @@ -1239,12 +1256,12 @@
}
.user-info {
width: 120px;
float: left;
text-align: center;
/*width: 120px;*/
/*float: left;*/
/*text-align: center;*/
color: #999;
line-height: 16px;
margin-left: -10px;
margin-left: 30px;
> * {
float:none;
... ... @@ -1906,3 +1923,20 @@
}
}
.judge-head{
span{
display: inline-block;
margin-right: 20px;
}
.name{
vertical-align: top;
line-height: 20px;
font-size: 16px;
}
}
... ...