Authored by 毕凯

flex 修改

@@ -52,38 +52,24 @@ $basicBtnC:#eb0313; @@ -52,38 +52,24 @@ $basicBtnC:#eb0313;
52 52
53 &.table { 53 &.table {
54 .js-wraper { 54 .js-wraper {
55 - @include flexbox((  
56 - display: box,  
57 - box-lines: multiple,  
58 - box-pack: start  
59 - ), $version: 1);  
60 - @include flexbox((  
61 - display: flex,  
62 - flex-wrap: wrap,  
63 - justify-content: flex-start  
64 - )); 55 + display: flex;
  56 + flex-wrap: wrap;
  57 + justify-content: flex-start;
  58 + }
  59 + width: 100%;
  60 + .column {
  61 + box-sizing: border-box;
  62 + /*padding: 20px 12px;*/
  63 + padding: 6px 3%;
  64 + width: 49.9%;
  65 + border: 1px solid #fff;
  66 + font-size: 24px;
  67 + background-color: $tableCellC;
  68 + word-wrap: break-word;
  69 + display: flex;
  70 + align-items: center;
  71 + flex-basis: 49.9%;
65 } 72 }
66 - width: 100%;  
67 - .column {  
68 - box-sizing: border-box;  
69 - /*padding: 20px 12px;*/  
70 - padding: 6px 3%;  
71 - width: 49.9%;  
72 - border: 1px solid #fff;  
73 - font-size: 24px;  
74 - background-color: $tableCellC;  
75 - word-wrap: break-word;  
76 - @include flexbox((  
77 - box-flex: 1.0,  
78 - display: box,  
79 - box-align: center  
80 - ), $version: 1);  
81 - @include flexbox((  
82 - display: flex,  
83 - align-items: center,  
84 - flex-basis: 49.9%  
85 - ))  
86 - }  
87 .oldbox{ 73 .oldbox{
88 padding: 6px 3%; 74 padding: 6px 3%;
89 width: 49.9%; 75 width: 49.9%;
@@ -244,15 +230,8 @@ $basicBtnC:#eb0313; @@ -244,15 +230,8 @@ $basicBtnC:#eb0313;
244 padding-right: 28px; 230 padding-right: 28px;
245 border-bottom: 1px solid $borderC; 231 border-bottom: 1px solid $borderC;
246 background-color: $pageBgC; 232 background-color: $pageBgC;
247 - @include flexbox((  
248 - box-flex: 1.0,  
249 - display: box,  
250 - box-align: center  
251 - ), $version: 1);  
252 - @include flexbox((  
253 - display: flex,  
254 - align-items: center  
255 - )); 233 + display: flex;
  234 + align-items: center;
256 span{ 235 span{
257 /*display: table-cell;*/ 236 /*display: table-cell;*/
258 display: -webkit-box; 237 display: -webkit-box;