fe / YOHOBUYWAP · Commits

Go to a project

Authored by Lynnic
Commit e7f6ac0a2456fc4bdd0f6c5a0ef24ea7ed934b73 2 parents e2ad3bb4 64b2286b

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

Conflicts:
	static/sass/product/_detail.scss
Inline Side-by-side
Showing 1 changed file with 13 additions and 5 deletions
@@ -30,20 +30,28 @@ $basicBtnC:#eb0313; @@ -30,20 +30,28 @@ $basicBtnC:#eb0313;
30 margin-top: pxToRem(20px); 30 margin-top: pxToRem(20px);
31 margin-bottom: pxToRem(20px); 31 margin-bottom: pxToRem(20px);
32 font-size: pxToRem(24px); 32 font-size: pxToRem(24px);
33 - line-height: pxToRem(36px); 33 + line-height: pxToRem(36px);
34 &.table { 34 &.table {
  35 + @include flexbox((
  36 + display: flex,
  37 + flex-wrap: wrap,
  38 + justify-content: flex-start
  39 + ));
35 width: 100%; 40 width: 100%;
36 .column { 41 .column {
37 box-sizing: border-box; 42 box-sizing: border-box;
38 - padding: pxToRem(20px) pxToRem(12px); 43 + //padding: pxToRem(20px) pxToRem(12px);
  44 + padding: 4% 3%;
39 //width: 50%; 45 //width: 50%;
40 border-bottom: pxToRem(4px) solid #fff; 46 border-bottom: pxToRem(4px) solid #fff;
41 border-right: pxToRem(4px) solid #fff; 47 border-right: pxToRem(4px) solid #fff;
42 font-size: pxToRem(24px); 48 font-size: pxToRem(24px);
43 background-color: $tableCellC; 49 background-color: $tableCellC;
44 - display: flex;  
45 - align-items: center;  
46 - flex-basis: 49.9%; 50 + @include flexbox((
  51 + display: flex,
  52 + align-items: center,
  53 + flex-basis: 49.9%
  54 + ))
47 } 55 }
48 } 56 }
49 } 57 }