diff --git a/src/less/core/wrapper/flex.horizontal.less b/src/less/core/wrapper/flex.horizontal.less index b58fe25c4..b6a8ccc97 100644 --- a/src/less/core/wrapper/flex.horizontal.less +++ b/src/less/core/wrapper/flex.horizontal.less @@ -160,10 +160,12 @@ } > .f-s-n { - -webkit-flex-shrink: 0; - -moz-flex-shrink: 0; - -ms-flex-shrink: 0; - flex-shrink: 0; + &, &.f-f { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } } > .f-f { @@ -171,5 +173,10 @@ -moz-flex-grow: 1; -ms-flex-grow: 1; flex-grow: 1; + // IE10下默认shrink为0 + -webkit-flex-shrink: 1; + -moz-flex-shrink: 1; + -ms-flex-shrink: 1; + flex-shrink: 1; } } diff --git a/src/less/core/wrapper/flex.vertical.less b/src/less/core/wrapper/flex.vertical.less index 1772deb9f..c8fbefa6b 100644 --- a/src/less/core/wrapper/flex.vertical.less +++ b/src/less/core/wrapper/flex.vertical.less @@ -159,10 +159,12 @@ } > .f-s-n { - -webkit-flex-shrink: 0; - -moz-flex-shrink: 0; - -ms-flex-shrink: 0; - flex-shrink: 0; + &, &.f-f { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } } > .f-f { @@ -170,5 +172,10 @@ -moz-flex-grow: 1; -ms-flex-grow: 1; flex-grow: 1; + // IE10下默认shrink为0 + -webkit-flex-shrink: 1; + -moz-flex-shrink: 1; + -ms-flex-shrink: 1; + flex-shrink: 1; } } diff --git a/src/less/core/wrapper/flex.wrapper.horizontal.less b/src/less/core/wrapper/flex.wrapper.horizontal.less index a54b68075..89de62f88 100644 --- a/src/less/core/wrapper/flex.wrapper.horizontal.less +++ b/src/less/core/wrapper/flex.wrapper.horizontal.less @@ -256,10 +256,12 @@ } > .f-s-n { - -webkit-flex-shrink: 0; - -moz-flex-shrink: 0; - -ms-flex-shrink: 0; - flex-shrink: 0; + &, &.f-f { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } } > .f-f { @@ -267,6 +269,11 @@ -moz-flex-grow: 1; -ms-flex-grow: 1; flex-grow: 1; + // IE10下默认shrink为0 + -webkit-flex-shrink: 1; + -moz-flex-shrink: 1; + -ms-flex-shrink: 1; + flex-shrink: 1; } } } diff --git a/src/less/core/wrapper/flex.wrapper.vertical.less b/src/less/core/wrapper/flex.wrapper.vertical.less index c836d9244..477891105 100644 --- a/src/less/core/wrapper/flex.wrapper.vertical.less +++ b/src/less/core/wrapper/flex.wrapper.vertical.less @@ -250,10 +250,12 @@ } > .f-s-n { - -webkit-flex-shrink: 0; - -moz-flex-shrink: 0; - -ms-flex-shrink: 0; - flex-shrink: 0; + &, &.f-f { + -webkit-flex-shrink: 0; + -moz-flex-shrink: 0; + -ms-flex-shrink: 0; + flex-shrink: 0; + } } > .f-f { @@ -261,6 +263,11 @@ -moz-flex-grow: 1; -ms-flex-grow: 1; flex-grow: 1; + // IE10下默认shrink为0 + -webkit-flex-shrink: 1; + -moz-flex-shrink: 1; + -ms-flex-shrink: 1; + flex-shrink: 1; } } }