fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by lore-w
Commit 562f5873695e6c5599e8b9f60f7b56155cd49bac 2 parents 22d6611d 246db09b

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

Inline Side-by-side
Showing 3 changed files with 10 additions and 10 deletions
@@ -45,9 +45,9 @@ $basicBtnC:#eb0313; @@ -45,9 +45,9 @@ $basicBtnC:#eb0313;
45 font-size: pxToRem(24px); 45 font-size: pxToRem(24px);
46 background-color: $tableCellC; 46 background-color: $tableCellC;
47 float: left; 47 float: left;
48 - &:nth-child(even) {  
49 - border-right: none;  
50 - } 48 + // &:nth-child(even) {
  49 + // border-right: none;
  50 + // }
51 } 51 }
52 } 52 }
53 } 53 }
@@ -10,10 +10,10 @@ @@ -10,10 +10,10 @@
10 background-size: cover; 10 background-size: cover;
11 } 11 }
12 .detail{ 12 .detail{
13 - background-color: $tableCellC;  
14 - &.table .inner-container{  
15 - background-color: $tableCellC;  
16 - } 13 + // background-color: $tableCellC;
  14 + // &.table .inner-container{
  15 + // background-color: $tableCellC;
  16 + // }
17 margin-bottom: 1px; 17 margin-bottom: 1px;
18 } 18 }
19 .desc-text { 19 .desc-text {
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 padding: pxToRem(16px) pxToRem(12px); 21 padding: pxToRem(16px) pxToRem(12px);
22 color: $mainFontC; 22 color: $mainFontC;
23 background-color: $tableCellC; 23 background-color: $tableCellC;
24 - border-top: 1px solid #fff; 24 + // border-top: 1px solid #fff;
25 } 25 }
26 } 26 }
27 .tips { 27 .tips {
@@ -113,8 +113,8 @@ @@ -113,8 +113,8 @@
113 </div> 113 </div>
114 {{/ enterStore}} 114 {{/ enterStore}}
115 115
116 - <!-- <div id="productDesc"></div> -->  
117 - {{> product/product-description}} 116 + <div id="productDesc"> </div>
  117 + <!-- {{> product/product-description}} -->
118 {{> product/recommend-for-you}} 118 {{> product/recommend-for-you}}
119 119
120 {{#cartInfo}} 120 {{#cartInfo}}