From 66b37a416fbb51be0402df2c93115093ae51a62f Mon Sep 17 00:00:00 2001 From: Young Date: Fri, 17 Nov 2017 11:24:11 +0800 Subject: [PATCH] =?UTF-8?q?flex=20=E5=B8=83=E5=B1=80IE10=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bi/core.css | 18 +++++++++++++++++- dist/bundle.css | 18 +++++++++++++++++- dist/core.css | 18 +++++++++++++++++- src/css/core/wrapper/flex.center.css | 2 ++ src/css/core/wrapper/flex.horizontal.css | 6 +++++- src/css/core/wrapper/flex.vertical.center.css | 4 ++++ src/css/core/wrapper/flex.wrapper.center.css | 2 ++ .../core/wrapper/flex.wrapper.horizontal.css | 2 ++ .../wrapper/flex.wrapper.vertical.center.css | 2 ++ src/less/core/wrapper/flex.center.less | 2 ++ src/less/core/wrapper/flex.horizontal.less | 6 +++++- .../core/wrapper/flex.vertical.center.less | 4 ++++ src/less/core/wrapper/flex.wrapper.center.less | 2 ++ .../core/wrapper/flex.wrapper.horizontal.less | 2 ++ .../wrapper/flex.wrapper.vertical.center.less | 2 ++ 15 files changed, 85 insertions(+), 5 deletions(-) diff --git a/bi/core.css b/bi/core.css index 1539fdef4..dc7d20f2a 100644 --- a/bi/core.css +++ b/bi/core.css @@ -1225,12 +1225,14 @@ i { -moz-justify-content: center; -ms-justify-content: center; -o-justify-content: center; + -ms-flex-pack: center; justify-content: center; /* 09版 */ -webkit-box-align: center; /* 12版 */ -webkit-align-items: center; -moz-align-items: center; + -ms-flex-align: center; -ms-align-items: center; -o-align-items: center; align-items: center; @@ -1263,13 +1265,15 @@ i { -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ - -webkit-box-align: flex-start; + -webkit-box-align: start; /* 12版 */ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -1288,6 +1292,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; } @@ -1298,6 +1303,7 @@ i { -webkit-align-items: flex-end; -moz-align-items: flex-end; -ms-align-items: flex-end; + -ms-flex-align: end; -o-align-items: flex-end; align-items: flex-end; } @@ -1329,6 +1335,7 @@ i { -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ -webkit-box-align: center; @@ -1336,6 +1343,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ @@ -1362,6 +1370,7 @@ i { -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -1370,6 +1379,7 @@ i { -webkit-align-items: stretch; -moz-align-items: stretch; -ms-align-items: stretch; + -ms-flex-align: stretch; -o-align-items: stretch; align-items: stretch; } @@ -1400,6 +1410,7 @@ i { -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -1408,6 +1419,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; min-width: 100%; @@ -1441,6 +1453,7 @@ i { -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -1449,6 +1462,7 @@ i { -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -1508,6 +1522,7 @@ i { -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -1516,6 +1531,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ diff --git a/dist/bundle.css b/dist/bundle.css index 79076aa31..4639c3d57 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -1225,12 +1225,14 @@ i { -moz-justify-content: center; -ms-justify-content: center; -o-justify-content: center; + -ms-flex-pack: center; justify-content: center; /* 09版 */ -webkit-box-align: center; /* 12版 */ -webkit-align-items: center; -moz-align-items: center; + -ms-flex-align: center; -ms-align-items: center; -o-align-items: center; align-items: center; @@ -1263,13 +1265,15 @@ i { -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ - -webkit-box-align: flex-start; + -webkit-box-align: start; /* 12版 */ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -1288,6 +1292,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; } @@ -1298,6 +1303,7 @@ i { -webkit-align-items: flex-end; -moz-align-items: flex-end; -ms-align-items: flex-end; + -ms-flex-align: end; -o-align-items: flex-end; align-items: flex-end; } @@ -1329,6 +1335,7 @@ i { -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ -webkit-box-align: center; @@ -1336,6 +1343,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ @@ -1362,6 +1370,7 @@ i { -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -1370,6 +1379,7 @@ i { -webkit-align-items: stretch; -moz-align-items: stretch; -ms-align-items: stretch; + -ms-flex-align: stretch; -o-align-items: stretch; align-items: stretch; } @@ -1400,6 +1410,7 @@ i { -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -1408,6 +1419,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; min-width: 100%; @@ -1441,6 +1453,7 @@ i { -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -1449,6 +1462,7 @@ i { -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -1508,6 +1522,7 @@ i { -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -1516,6 +1531,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ diff --git a/dist/core.css b/dist/core.css index 1539fdef4..dc7d20f2a 100644 --- a/dist/core.css +++ b/dist/core.css @@ -1225,12 +1225,14 @@ i { -moz-justify-content: center; -ms-justify-content: center; -o-justify-content: center; + -ms-flex-pack: center; justify-content: center; /* 09版 */ -webkit-box-align: center; /* 12版 */ -webkit-align-items: center; -moz-align-items: center; + -ms-flex-align: center; -ms-align-items: center; -o-align-items: center; align-items: center; @@ -1263,13 +1265,15 @@ i { -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ - -webkit-box-align: flex-start; + -webkit-box-align: start; /* 12版 */ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -1288,6 +1292,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; } @@ -1298,6 +1303,7 @@ i { -webkit-align-items: flex-end; -moz-align-items: flex-end; -ms-align-items: flex-end; + -ms-flex-align: end; -o-align-items: flex-end; align-items: flex-end; } @@ -1329,6 +1335,7 @@ i { -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ -webkit-box-align: center; @@ -1336,6 +1343,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ @@ -1362,6 +1370,7 @@ i { -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -1370,6 +1379,7 @@ i { -webkit-align-items: stretch; -moz-align-items: stretch; -ms-align-items: stretch; + -ms-flex-align: stretch; -o-align-items: stretch; align-items: stretch; } @@ -1400,6 +1410,7 @@ i { -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -1408,6 +1419,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; min-width: 100%; @@ -1441,6 +1453,7 @@ i { -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -1449,6 +1462,7 @@ i { -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -1508,6 +1522,7 @@ i { -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -1516,6 +1531,7 @@ i { -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ diff --git a/src/css/core/wrapper/flex.center.css b/src/css/core/wrapper/flex.center.css index 74feeac54..ed99aea82 100644 --- a/src/css/core/wrapper/flex.center.css +++ b/src/css/core/wrapper/flex.center.css @@ -26,12 +26,14 @@ -moz-justify-content: center; -ms-justify-content: center; -o-justify-content: center; + -ms-flex-pack: center; justify-content: center; /* 09版 */ -webkit-box-align: center; /* 12版 */ -webkit-align-items: center; -moz-align-items: center; + -ms-flex-align: center; -ms-align-items: center; -o-align-items: center; align-items: center; diff --git a/src/css/core/wrapper/flex.horizontal.css b/src/css/core/wrapper/flex.horizontal.css index 195649267..af5f275cc 100644 --- a/src/css/core/wrapper/flex.horizontal.css +++ b/src/css/core/wrapper/flex.horizontal.css @@ -26,13 +26,15 @@ -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ - -webkit-box-align: flex-start; + -webkit-box-align: start; /* 12版 */ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ @@ -51,6 +53,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; } @@ -61,6 +64,7 @@ -webkit-align-items: flex-end; -moz-align-items: flex-end; -ms-align-items: flex-end; + -ms-flex-align: end; -o-align-items: flex-end; align-items: flex-end; } diff --git a/src/css/core/wrapper/flex.vertical.center.css b/src/css/core/wrapper/flex.vertical.center.css index 0a0bd8a1e..388df2363 100644 --- a/src/css/core/wrapper/flex.vertical.center.css +++ b/src/css/core/wrapper/flex.vertical.center.css @@ -26,6 +26,7 @@ -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ -webkit-box-align: center; @@ -33,6 +34,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ @@ -59,6 +61,7 @@ -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -67,6 +70,7 @@ -webkit-align-items: stretch; -moz-align-items: stretch; -ms-align-items: stretch; + -ms-flex-align: stretch; -o-align-items: stretch; align-items: stretch; } diff --git a/src/css/core/wrapper/flex.wrapper.center.css b/src/css/core/wrapper/flex.wrapper.center.css index a3f2e030e..41c20dd6c 100644 --- a/src/css/core/wrapper/flex.wrapper.center.css +++ b/src/css/core/wrapper/flex.wrapper.center.css @@ -25,6 +25,7 @@ -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -33,6 +34,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; min-width: 100%; diff --git a/src/css/core/wrapper/flex.wrapper.horizontal.css b/src/css/core/wrapper/flex.wrapper.horizontal.css index d3435658b..3d6570b28 100644 --- a/src/css/core/wrapper/flex.wrapper.horizontal.css +++ b/src/css/core/wrapper/flex.wrapper.horizontal.css @@ -25,6 +25,7 @@ -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -33,6 +34,7 @@ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; /* 09版 */ diff --git a/src/css/core/wrapper/flex.wrapper.vertical.center.css b/src/css/core/wrapper/flex.wrapper.vertical.center.css index 67a30fc7c..9de74f566 100644 --- a/src/css/core/wrapper/flex.wrapper.vertical.center.css +++ b/src/css/core/wrapper/flex.wrapper.vertical.center.css @@ -25,6 +25,7 @@ -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; /* 09版 */ @@ -33,6 +34,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; /* 09版 */ diff --git a/src/less/core/wrapper/flex.center.less b/src/less/core/wrapper/flex.center.less index ce7c581dc..279e6ff43 100644 --- a/src/less/core/wrapper/flex.center.less +++ b/src/less/core/wrapper/flex.center.less @@ -22,6 +22,7 @@ -moz-justify-content: center; -ms-justify-content: center; -o-justify-content: center; + -ms-flex-pack: center; justify-content: center; /* 09版 */ @@ -29,6 +30,7 @@ /* 12版 */ -webkit-align-items: center; -moz-align-items: center; + -ms-flex-align: center; -ms-align-items: center; -o-align-items: center; align-items: center; diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less index 7ecd307ec..b348d7b2f 100644 --- a/src/less/core/wrapper/flex.horizontal.less +++ b/src/less/core/wrapper/flex.horizontal.less @@ -22,14 +22,16 @@ -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ - -webkit-box-align: flex-start; + -webkit-box-align: start; /* 12版 */ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; @@ -49,6 +51,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; } @@ -59,6 +62,7 @@ -webkit-align-items: flex-end; -moz-align-items: flex-end; -ms-align-items: flex-end; + -ms-flex-align: end; -o-align-items: flex-end; align-items: flex-end; } diff --git a/src/less/core/wrapper/flex.vertical.center.less b/src/less/core/wrapper/flex.vertical.center.less index f4f02a867..06954878a 100644 --- a/src/less/core/wrapper/flex.vertical.center.less +++ b/src/less/core/wrapper/flex.vertical.center.less @@ -22,6 +22,7 @@ -moz-justify-content: flex-start; -ms-justify-content: flex-start; -o-justify-content: flex-start; + -ms-flex-pack: start; justify-content: flex-start; /* 09版 */ @@ -30,6 +31,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; @@ -58,6 +60,7 @@ -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; /* 09版 */ @@ -66,6 +69,7 @@ -webkit-align-items: stretch; -moz-align-items: stretch; -ms-align-items: stretch; + -ms-flex-align: stretch; -o-align-items: stretch; align-items: stretch; } diff --git a/src/less/core/wrapper/flex.wrapper.center.less b/src/less/core/wrapper/flex.wrapper.center.less index c430c58d5..460fcc88e 100644 --- a/src/less/core/wrapper/flex.wrapper.center.less +++ b/src/less/core/wrapper/flex.wrapper.center.less @@ -21,6 +21,7 @@ -webkit-justify-content: center; -moz-justify-content: center; -ms-justify-content: center; + -ms-flex-pack: center; -o-justify-content: center; justify-content: center; @@ -30,6 +31,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center; diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index 602c4bb6d..592f23d47 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -21,6 +21,7 @@ -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; @@ -30,6 +31,7 @@ -webkit-align-items: flex-start; -moz-align-items: flex-start; -ms-align-items: flex-start; + -ms-flex-align: start; -o-align-items: flex-start; align-items: flex-start; diff --git a/src/less/core/wrapper/flex.wrapper.vertical.center.less b/src/less/core/wrapper/flex.wrapper.vertical.center.less index e1da79b9d..67221e625 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.center.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.center.less @@ -22,6 +22,7 @@ -webkit-justify-content: flex-start; -moz-justify-content: flex-start; -ms-justify-content: flex-start; + -ms-flex-pack: start; -o-justify-content: flex-start; justify-content: flex-start; @@ -31,6 +32,7 @@ -webkit-align-items: center; -moz-align-items: center; -ms-align-items: center; + -ms-flex-align: center; -o-align-items: center; align-items: center;