Authored by htoooth

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

…into feature/new-product-detail
@@ -36,8 +36,8 @@ @@ -36,8 +36,8 @@
36 36
37 <div class="other-infos"> 37 <div class="other-infos">
38 <div class="description-material info-block"> 38 <div class="description-material info-block">
39 - <p class="block-title">  
40 - <span class="title cur">商品信息 Product Info</span> 39 + <p class="block-title"id="block-title-head">
  40 + <span class="title cur">商品信息</span>
41 41
42 </p> 42 </p>
43 <div class="description-content"> 43 <div class="description-content">
@@ -72,9 +72,10 @@ @@ -72,9 +72,10 @@
72 72
73 </div> 73 </div>
74 <div class="description-material info-block"> 74 <div class="description-material info-block">
  75 +
75 <p class="block-title"> 76 <p class="block-title">
76 77
77 - <span class="title cur">材质洗涤 Washing Instructions</span> 78 + <span class="title cur">材质洗涤</span>
78 </p> 79 </p>
79 80
80 <div class="material-content"> 81 <div class="material-content">
@@ -106,7 +107,7 @@ @@ -106,7 +107,7 @@
106 </div> 107 </div>
107 <div class="description-material-tab info-block"> 108 <div class="description-material-tab info-block">
108 <p class="block-title"> 109 <p class="block-title">
109 - <span class="title cur">尺码信息 Size Guide</span> 110 + <span class="title cur">尺码信息</span>
110 111
111 </p> 112 </p>
112 <div class="size-content"> 113 <div class="size-content">
1 {{#each comments}} 1 {{#each comments}}
2 <li> 2 <li>
3 - <div class="user-info clearfix">  
4 - <img class="user-avatar" src="{{avatar}}"> 3 + <div class="user-info clearfix judge-head">
  4 + <!-- <img class="user-avatar" src="{{avatar}}"> -->
5 <span class="name">{{userName}}</span> 5 <span class="name">{{userName}}</span>
  6 +
  7 + <span class="comment-star pull-left">
  8 + <span class="star-{{star}} active"></span>
  9 + </span>
  10 +
6 </div> 11 </div>
7 <dl class="pull-right"> 12 <dl class="pull-right">
8 {{#if color}}<dd>颜色:{{color}}</dd>{{/if}} 13 {{#if color}}<dd>颜色:{{color}}</dd>{{/if}}
@@ -15,21 +20,14 @@ @@ -15,21 +20,14 @@
15 {{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}} 20 {{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}
16 </dd> 21 </dd>
17 </dl> 22 </dl>
  23 + <!-- <div style="clear:both"></div> -->
18 <div class="comment-detail"> 24 <div class="comment-detail">
19 - <div class="tag-list clearfix"> 25 + <!-- <div class="tag-list clearfix">
20 <span class="comment-star pull-left"> 26 <span class="comment-star pull-left">
21 <span class="star-{{star}} active"></span> 27 <span class="star-{{star}} active"></span>
22 </span> 28 </span>
23 - <dl class="horizontal-list pull-right">  
24 - <dd>尺码符合度:  
25 - {{#if_cond comfort "===" "MIDDLE"}}合适{{/if_cond}}  
26 - {{#if_cond comfort "===" "SMALL"}}偏小{{/if_cond}}  
27 - {{#if_cond comfort "===" "BIG"}}偏大{{/if_cond}}  
28 - </dd>  
29 - <dd>{{#if height}}身高:{{height}} 厘米{{/if}}</dd>  
30 - <dd>{{#if weight}}体重:{{weight}} 公斤{{/if}}</dd>  
31 - </dl>  
32 - </div> 29 +
  30 + </div> -->
33 31
34 <p class="comment">{{comment}}</p> 32 <p class="comment">{{comment}}</p>
35 33
@@ -798,14 +798,21 @@ @@ -798,14 +798,21 @@
798 } 798 }
799 } 799 }
800 800
801 - .info-bootom{ 801 + .info-bootom {
802 margin-top: 0px; 802 margin-top: 0px;
803 } 803 }
804 804
805 - .block-title { 805 + #block-title-head {
  806 + margin-top: 20px;
806 margin-bottom: 25px; 807 margin-bottom: 25px;
  808 + }
  809 +
  810 + .block-title {
  811 + margin-bottom: 44px;
  812 + margin-top: -18px;
807 text-align: center; 813 text-align: center;
808 814
  815 +
809 .title { 816 .title {
810 display: inline-block; 817 display: inline-block;
811 padding-top: 15px; 818 padding-top: 15px;
@@ -814,10 +821,15 @@ @@ -814,10 +821,15 @@
814 font-size: 18px; 821 font-size: 18px;
815 margin-left: auto; 822 margin-left: auto;
816 margin-right: auto; 823 margin-right: auto;
  824 +
817 &.cur { 825 &.cur {
818 color: #222; 826 color: #222;
819 - border-top: 2px solid #222;  
820 - margin-top: -2px; 827 + /*border-top: 2px solid #222;*/
  828 + /*margin-top: -2px;*/
  829 + border: 1px solid #000;
  830 + padding: 8px 26px;
  831 + text-align: center;
  832 + background-color: #fff;
821 } 833 }
822 834
823 } 835 }
@@ -1074,6 +1086,7 @@ @@ -1074,6 +1086,7 @@
1074 li { 1086 li {
1075 border-top: 1px solid #eaeceb; 1087 border-top: 1px solid #eaeceb;
1076 padding: 20px 0; 1088 padding: 20px 0;
  1089 + min-height: 150px;
1077 } 1090 }
1078 1091
1079 .user-info { 1092 .user-info {
@@ -1095,6 +1108,8 @@ @@ -1095,6 +1108,8 @@
1095 .question { 1108 .question {
1096 color: #222; 1109 color: #222;
1097 } 1110 }
  1111 +
  1112 +
1098 } 1113 }
1099 1114
1100 .user-avatar { 1115 .user-avatar {
@@ -1104,8 +1119,8 @@ @@ -1104,8 +1119,8 @@
1104 } 1119 }
1105 1120
1106 .comment-detail{ 1121 .comment-detail{
1107 - margin-left:120px;  
1108 - margin-right:120px; 1122 + margin-left:30px;
  1123 + /*margin-right:120px;*/
1109 1124
1110 .tag-list{ 1125 .tag-list{
1111 height:24px; 1126 height:24px;
@@ -1214,6 +1229,8 @@ @@ -1214,6 +1229,8 @@
1214 .comment { 1229 .comment {
1215 margin-bottom:10px; 1230 margin-bottom:10px;
1216 line-height: 1.5; 1231 line-height: 1.5;
  1232 + font-size: 14px;
  1233 + color: #000;
1217 } 1234 }
1218 1235
1219 /*.consults { 1236 /*.consults {
@@ -1239,12 +1256,12 @@ @@ -1239,12 +1256,12 @@
1239 } 1256 }
1240 1257
1241 .user-info { 1258 .user-info {
1242 - width: 120px;  
1243 - float: left;  
1244 - text-align: center; 1259 + /*width: 120px;*/
  1260 + /*float: left;*/
  1261 + /*text-align: center;*/
1245 color: #999; 1262 color: #999;
1246 line-height: 16px; 1263 line-height: 16px;
1247 - margin-left: -10px; 1264 + margin-left: 30px;
1248 1265
1249 > * { 1266 > * {
1250 float:none; 1267 float:none;
@@ -1906,3 +1923,20 @@ @@ -1906,3 +1923,20 @@
1906 } 1923 }
1907 1924
1908 } 1925 }
  1926 +
  1927 + .judge-head{
  1928 +
  1929 +
  1930 + span{
  1931 + display: inline-block;
  1932 + margin-right: 20px;
  1933 +
  1934 + }
  1935 +
  1936 + .name{
  1937 + vertical-align: top;
  1938 + line-height: 20px;
  1939 + font-size: 16px;
  1940 + }
  1941 +
  1942 + }