fe / YOHOBUYWAP · Commits

Go to a project

Authored by Lynnic
Commit e276d0268a2e4b2ddc7b7dc85327d8d813cbb01f 2 parents 43454a81 3c8a4d01

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

Inline Side-by-side
Showing 2 changed files with 21 additions and 26 deletions
@@ -37,14 +37,14 @@ $basicBtnC:#eb0313; @@ -37,14 +37,14 @@ $basicBtnC:#eb0313;
37 .column { 37 .column {
38 box-sizing: border-box; 38 box-sizing: border-box;
39 padding: pxToRem(20px) pxToRem(12px); 39 padding: pxToRem(20px) pxToRem(12px);
40 - width: 50%;  
41 - border-bottom: 1px solid #fff;  
42 - border-right: 1px solid #fff; 40 + //width: 50%;
  41 + border-bottom: pxToRem(4px) solid #fff;
  42 + border-right: pxToRem(4px) solid #fff;
43 font-size: pxToRem(24px); 43 font-size: pxToRem(24px);
44 background-color: $tableCellC; 44 background-color: $tableCellC;
45 - float: left;  
46 display: flex; 45 display: flex;
47 align-items: center; 46 align-items: center;
  47 + flex-basis: 49.9%;
48 } 48 }
49 } 49 }
50 } 50 }
@@ -46,39 +46,34 @@ @@ -46,39 +46,34 @@
46 } 46 }
47 .detail { 47 .detail {
48 .material-item{ 48 .material-item{
49 - position: relative;  
50 - min-height: pxToRem(136px);  
51 margin: pxToRem(10px) 0; 49 margin: pxToRem(10px) 0;
52 - text-align: center;  
53 - display: flex;  
54 - align-items: center; 50 + @include flexbox((
  51 + display: flex,
  52 + align-items: center
  53 + ));
55 54
56 - // width: 100%;  
57 - // border-bottom:1px solid $borderC;  
58 img { 55 img {
59 - //position:absolute;  
60 - //top:0;  
61 - //bottom:0;  
62 - //left:0;  
63 - //margin:auto;  
64 - //width: pxToRem(90px);  
65 - //height: auto;  
66 - //padding-right: pxToRem(20px); 56 + margin: 0;
67 } 57 }
68 .material-image { 58 .material-image {
69 - display: inline-block;  
70 - width: 23%; 59 + @include flexbox((
  60 + display: flex,
  61 + flex-basis: 23%,
  62 + justify-content: center
  63 + ));
71 } 64 }
72 .material-desc { 65 .material-desc {
73 - //padding-left:pxToRem(120px);  
74 font-size: pxToRem(24px); 66 font-size: pxToRem(24px);
  67 + box-sizing: border-box;
75 text-align: left; 68 text-align: left;
76 - display: inline-block;  
77 - width: 75%;  
78 padding-left: 2%; 69 padding-left: 2%;
79 height: auto; 70 height: auto;
80 - line-height: pxToRem(40px); 71 + line-height: pxToRem(38px);
81 color: #4b4b4b; 72 color: #4b4b4b;
  73 + @include flexbox((
  74 + display: flex,
  75 + flex-basis: 76.9%
  76 + ));
82 } 77 }
83 &:last-child{ 78 &:last-child{
84 border-bottom: none; 79 border-bottom: none;
@@ -152,7 +147,7 @@ @@ -152,7 +147,7 @@
152 width: pxToRem(70px); 147 width: pxToRem(70px);
153 margin-top: pxToRem(55px); 148 margin-top: pxToRem(55px);
154 div{ 149 div{
155 - height: pxToRem(55px); 150 + height: pxToRem(55px);
156 .avatar { 151 .avatar {
157 display: inline-block; 152 display: inline-block;
158 width: pxToRem(40px); 153 width: pxToRem(40px);