Browse Source

Pull request #2582: 无JIRA任务 chore: IE10下默认shrink不是1

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'f23c7488f56fa1875ccf4114c07c909eb46eeb86':
  chore: IE10下默认shrink不是1
es6
guy 3 years ago
parent
commit
53b878ec17
  1. 15
      src/less/core/wrapper/flex.horizontal.less
  2. 15
      src/less/core/wrapper/flex.vertical.less
  3. 15
      src/less/core/wrapper/flex.wrapper.horizontal.less
  4. 15
      src/less/core/wrapper/flex.wrapper.vertical.less

15
src/less/core/wrapper/flex.horizontal.less

@ -160,10 +160,12 @@
} }
> .f-s-n { > .f-s-n {
-webkit-flex-shrink: 0; &, &.f-f {
-moz-flex-shrink: 0; -webkit-flex-shrink: 0;
-ms-flex-shrink: 0; -moz-flex-shrink: 0;
flex-shrink: 0; -ms-flex-shrink: 0;
flex-shrink: 0;
}
} }
> .f-f { > .f-f {
@ -171,5 +173,10 @@
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;
flex-grow: 1; flex-grow: 1;
// IE10下默认shrink为0
-webkit-flex-shrink: 1;
-moz-flex-shrink: 1;
-ms-flex-shrink: 1;
flex-shrink: 1;
} }
} }

15
src/less/core/wrapper/flex.vertical.less

@ -159,10 +159,12 @@
} }
> .f-s-n { > .f-s-n {
-webkit-flex-shrink: 0; &, &.f-f {
-moz-flex-shrink: 0; -webkit-flex-shrink: 0;
-ms-flex-shrink: 0; -moz-flex-shrink: 0;
flex-shrink: 0; -ms-flex-shrink: 0;
flex-shrink: 0;
}
} }
> .f-f { > .f-f {
@ -170,5 +172,10 @@
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;
flex-grow: 1; flex-grow: 1;
// IE10下默认shrink为0
-webkit-flex-shrink: 1;
-moz-flex-shrink: 1;
-ms-flex-shrink: 1;
flex-shrink: 1;
} }
} }

15
src/less/core/wrapper/flex.wrapper.horizontal.less

@ -256,10 +256,12 @@
} }
> .f-s-n { > .f-s-n {
-webkit-flex-shrink: 0; &, &.f-f {
-moz-flex-shrink: 0; -webkit-flex-shrink: 0;
-ms-flex-shrink: 0; -moz-flex-shrink: 0;
flex-shrink: 0; -ms-flex-shrink: 0;
flex-shrink: 0;
}
} }
> .f-f { > .f-f {
@ -267,6 +269,11 @@
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;
flex-grow: 1; flex-grow: 1;
// IE10下默认shrink为0
-webkit-flex-shrink: 1;
-moz-flex-shrink: 1;
-ms-flex-shrink: 1;
flex-shrink: 1;
} }
} }
} }

15
src/less/core/wrapper/flex.wrapper.vertical.less

@ -250,10 +250,12 @@
} }
> .f-s-n { > .f-s-n {
-webkit-flex-shrink: 0; &, &.f-f {
-moz-flex-shrink: 0; -webkit-flex-shrink: 0;
-ms-flex-shrink: 0; -moz-flex-shrink: 0;
flex-shrink: 0; -ms-flex-shrink: 0;
flex-shrink: 0;
}
} }
> .f-f { > .f-f {
@ -261,6 +263,11 @@
-moz-flex-grow: 1; -moz-flex-grow: 1;
-ms-flex-grow: 1; -ms-flex-grow: 1;
flex-grow: 1; flex-grow: 1;
// IE10下默认shrink为0
-webkit-flex-shrink: 1;
-moz-flex-shrink: 1;
-ms-flex-shrink: 1;
flex-shrink: 1;
} }
} }
} }

Loading…
Cancel
Save