chenchao / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit 8c27ebc7088987afe5ae798698aa38d3d6d59610 2 parents 711d794f dc3c1151

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

Inline Side-by-side
Showing 1 changed file with 2 additions and 4 deletions
@@ -48,8 +48,7 @@ $basicBtnC:#eb0313; @@ -48,8 +48,7 @@ $basicBtnC:#eb0313;
48 //padding: pxToRem(20px) pxToRem(12px); 48 //padding: pxToRem(20px) pxToRem(12px);
49 padding: pxToRem(6px) 3%; 49 padding: pxToRem(6px) 3%;
50 width: 49.9%; 50 width: 49.9%;
51 - border-bottom: pxToRem(4px) solid #fff;  
52 - border-right: pxToRem(4px) solid #fff; 51 + border: 1px solid #fff;
53 font-size: pxToRem(24px); 52 font-size: pxToRem(24px);
54 background-color: $tableCellC; 53 background-color: $tableCellC;
55 word-wrap: break-word; 54 word-wrap: break-word;
@@ -69,8 +68,7 @@ $basicBtnC:#eb0313; @@ -69,8 +68,7 @@ $basicBtnC:#eb0313;
69 width: 49.9%; 68 width: 49.9%;
70 background-color: $tableCellC; 69 background-color: $tableCellC;
71 box-sizing: border-box; 70 box-sizing: border-box;
72 - border-bottom: 1px solid #fff;  
73 - border-right: 1px solid #fff; 71 + border: 1px solid #fff;
74 width: 49.9%; 72 width: 49.9%;
75 height: 100%; 73 height: 100%;
76 float: left; 74 float: left;