Permalink
Browse files

Added inline-flex for both IE 10 and others

  • Loading branch information...
1 parent 1bd9a78 commit d6f95aa549d1470a3d18b4c1e1096e1d2cb37263 @old9 old9 committed Aug 23, 2013
Showing with 59 additions and 2 deletions.
  1. +6 −2 lib/nib/flex.styl
  2. +36 −0 test/cases/flex.css
  3. +17 −0 test/cases/flex.styl
View
@@ -11,8 +11,12 @@ flex-version ?= box flex
display(type, args...)
if flex == type || inline-flex == type
if box in flex-version
- display: -ms-flexbox args
- display: vendor-value(box args, only: moz webkit)
+ if flex == type
+ display: -ms-flexbox args
+ display: vendor-value(box args, only: moz webkit)
+ else
+ display: -ms-inline-flexbox args
+ display: vendor-value(inline-box args, only: moz webkit)
if flex in flex-version
display: vendor-value(arguments, only: webkit official) // overwrites old webkit
else
View
@@ -21,6 +21,14 @@ section div {
-ms-flex: 1 0;
flex: 1 0;
}
+section {
+ display: -webkit-inline-box;
+ display: -moz-inline-box;
+ display: -webkit-inline-flex;
+ display: -ms-inline-flexbox;
+ display: inline-box;
+ display: inline-flex;
+}
flex-flow {
-webkit-box-direction: reverse;
-moz-box-direction: reverse;
@@ -197,6 +205,14 @@ section {
display: flex !important;
}
section {
+ display: -webkit-inline-box !important;
+ display: -moz-inline-box !important;
+ display: -webkit-inline-flex !important;
+ display: -ms-inline-flexbox !important;
+ display: inline-box !important;
+ display: inline-flex !important;
+}
+section {
display: -webkit-box;
display: -moz-box;
display: -ms-flexbox;
@@ -212,12 +228,24 @@ section div {
box-flex: 1;
}
section {
+ display: -webkit-inline-box;
+ display: -moz-inline-box;
+ display: -ms-inline-flexbox;
+ display: inline-box;
+}
+section {
display: -webkit-box !important;
display: -moz-box !important;
display: -ms-flexbox !important;
display: box !important;
}
section {
+ display: -webkit-inline-box !important;
+ display: -moz-inline-box !important;
+ display: -ms-inline-flexbox !important;
+ display: inline-box !important;
+}
+section {
display: -webkit-flex;
display: flex;
-webkit-flex-direction: row;
@@ -230,6 +258,14 @@ section div {
flex: 1 0;
}
section {
+ display: -webkit-inline-flex;
+ display: inline-flex;
+}
+section {
display: -webkit-flex !important;
display: flex !important;
}
+section {
+ display: -webkit-inline-flex !important;
+ display: inline-flex !important;
+}
View
@@ -9,6 +9,9 @@ section
div
flex: 1 0
+section
+ display: inline-flex
+
flex-flow
flex-flow row-reverse
flex-flow row wrap
@@ -49,6 +52,8 @@ order
section
display: flex !important
+section
+ display: inline-flex !important
// Obsolete property conditional rendering
flex-version = box
@@ -60,8 +65,14 @@ section
flex: 1 0
section
+ display: inline-flex
+
+section
display: flex !important
+section
+ display: inline-flex !important
+
// New property conditional rendering
flex-version = flex
@@ -73,4 +84,10 @@ section
flex: 1 0
section
+ display: inline-flex
+
+section
display: flex !important
+
+section
+ display: inline-flex !important

0 comments on commit d6f95aa

Please sign in to comment.