Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
2 changed files
with
11 additions
and
5 deletions
| @@ -31,7 +31,11 @@ $basicBtnC:#eb0313; | @@ -31,7 +31,11 @@ $basicBtnC:#eb0313; | ||
| 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 | - | 34 | + @include flexbox(( |
| 35 | + display: flex, | ||
| 36 | + flex-wrap: wrap, | ||
| 37 | + justify-content: space-around | ||
| 38 | + )); | ||
| 35 | &.table { | 39 | &.table { |
| 36 | width: 100%; | 40 | width: 100%; |
| 37 | .column { | 41 | .column { |
| @@ -42,9 +46,11 @@ $basicBtnC:#eb0313; | @@ -42,9 +46,11 @@ $basicBtnC:#eb0313; | ||
| 42 | border-right: pxToRem(4px) solid #fff; | 46 | border-right: pxToRem(4px) solid #fff; |
| 43 | font-size: pxToRem(24px); | 47 | font-size: pxToRem(24px); |
| 44 | background-color: $tableCellC; | 48 | background-color: $tableCellC; |
| 45 | - display: flex; | ||
| 46 | - align-items: center; | ||
| 47 | - flex-basis: 49.9%; | 49 | + @include flexbox(( |
| 50 | + display: flex, | ||
| 51 | + align-items: center, | ||
| 52 | + flex-basis: 49.9% | ||
| 53 | + )) | ||
| 48 | } | 54 | } |
| 49 | } | 55 | } |
| 50 | } | 56 | } |
-
Please register or login to post a comment