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

…into feature/new-product-detail

@@ -36,8 +36,8 @@
 
 
             <div class="other-infos">
             <div class="other-infos">
                 <div class="description-material info-block">
                 <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>
                     </p>
                     <div class="description-content">
                     <div class="description-content">
@@ -72,12 +72,13 @@
 
 
                 </div>
                 </div>
                 <div class="description-material info-block">
                 <div class="description-material info-block">
+
                     <p class="block-title">
                     <p class="block-title">
 
 
-                        <span class="title cur">材质洗涤 Washing Instructions</span>
+                        <span class="title cur">材质洗涤</span>
                     </p>
                     </p>
 
 
-                    <div class="material-content">
+                  <div class="material-content">
                         {{# material}}
                         {{# material}}
                             {{#if materialDetail}}
                             {{#if materialDetail}}
                                 <ul class="material-detail">
                                 <ul class="material-detail">
@@ -106,7 +107,7 @@
                 </div>
                 </div>
                 <div class="description-material-tab info-block">
                 <div class="description-material-tab info-block">
                     <p class="block-title">
                     <p class="block-title">
-                        <span class="title cur">尺码信息 Size Guide</span>
+                        <span class="title cur">尺码信息</span>
 
 
                     </p>
                     </p>
                     <div class="size-content">
                     <div class="size-content">

 {{#each comments}}
 {{#each comments}}
     <li>
     <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="name">{{userName}}</span>
+
+                <span class="comment-star pull-left">
+                    <span class="star-{{star}} active"></span>
+                </span>
+
         </div>
         </div>
         <dl class="pull-right">
         <dl class="pull-right">
             {{#if color}}<dd>颜色：{{color}}</dd>{{/if}}
             {{#if color}}<dd>颜色：{{color}}</dd>{{/if}}
@@ -15,21 +20,14 @@
                 {{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}
                 {{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}
             </dd>
             </dd>
         </dl>
         </dl>
+        <!-- <div style="clear:both"></div> -->
         <div class="comment-detail">
         <div class="comment-detail">
-            <div class="tag-list clearfix">
+            <!-- <div class="tag-list clearfix">
                 <span class="comment-star pull-left">
                 <span class="comment-star pull-left">
                     <span class="star-{{star}} active"></span>
                     <span class="star-{{star}} active"></span>
                 </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>
             <p class="comment">{{comment}}</p>
 
 

@@ -798,14 +798,21 @@
         }
         }
     }
     }
 
 
-    .info-bootom{
+    .info-bootom {
       margin-top: 0px;
       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;
         text-align: center;
 
 
+
         .title {
         .title {
             display: inline-block;
             display: inline-block;
             padding-top: 15px;
             padding-top: 15px;
@@ -814,10 +821,15 @@
             font-size: 18px;
             font-size: 18px;
             margin-left: auto;
             margin-left: auto;
             margin-right: auto;
             margin-right: auto;
+
             &.cur {
             &.cur {
                 color: #222;
                 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 {
         li {
             border-top: 1px solid #eaeceb;
             border-top: 1px solid #eaeceb;
             padding: 20px 0;
             padding: 20px 0;
+            min-height: 150px;
         }
         }
 
 
         .user-info {
         .user-info {
@@ -1095,6 +1108,8 @@
             .question {
             .question {
                 color: #222;
                 color: #222;
             }
             }
+
+
         }
         }
 
 
         .user-avatar {
         .user-avatar {
@@ -1104,8 +1119,8 @@
         }
         }
 
 
         .comment-detail{
         .comment-detail{
-            margin-left:120px;
-            margin-right:120px;
+            margin-left:30px;
+            /*margin-right:120px;*/
 
 
             .tag-list{
             .tag-list{
                 height:24px;
                 height:24px;
@@ -1214,6 +1229,8 @@
         .comment {
         .comment {
             margin-bottom:10px;
             margin-bottom:10px;
             line-height: 1.5;
             line-height: 1.5;
+            font-size: 14px;
+            color: #000;
         }
         }
 
 
         /*.consults {
         /*.consults {
@@ -1239,12 +1256,12 @@
             }
             }
 
 
             .user-info {
             .user-info {
-                width: 120px;
-                float: left;
-                text-align: center;
+                /*width: 120px;*/
+                /*float: left;*/
+                /*text-align: center;*/
                 color: #999;
                 color: #999;
                 line-height: 16px;
                 line-height: 16px;
-                margin-left: -10px;
+                margin-left: 30px;
 
 
                 > * {
                 > * {
                     float:none;
                     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;
+        }
+
+     }