Authored by biao

resolve conflict

... ... @@ -31,7 +31,11 @@ $basicBtnC:#eb0313;
margin-bottom: pxToRem(20px);
font-size: pxToRem(24px);
line-height: pxToRem(36px);
@include flexbox((
display: flex,
flex-wrap: wrap,
justify-content: space-around
));
&.table {
width: 100%;
.column {
... ... @@ -42,9 +46,11 @@ $basicBtnC:#eb0313;
border-right: pxToRem(4px) solid #fff;
font-size: pxToRem(24px);
background-color: $tableCellC;
display: flex;
align-items: center;
flex-basis: 49.9%;
@include flexbox((
display: flex,
align-items: center,
flex-basis: 49.9%
))
}
}
}
... ...