Permalink
Browse files

Fix duplicate box-flex properties

  • Loading branch information...
1 parent a94cede commit 545c9d13b96ff47c69723bdea849dfbb58f31dce @tonistiigi tonistiigi committed Oct 26, 2012
Showing with 2 additions and 5 deletions.
  1. +1 −1 lib/nib/flex.styl
  2. +1 −1 lib/nib/vendor.styl
  3. +0 −3 test/cases/flex.css
View
@@ -45,7 +45,7 @@ align-items(align)
flex(growth)
// obsolete
- vendor('box-flex', growth)
+ box-flex growth
// new
vendor('flex', arguments, only: webkit official)
View
@@ -338,7 +338,7 @@ box-orient()
*/
box-flex()
- vendor('box-flex', arguments, only: webkit moz ms official)
+ vendor('box-flex', arguments, only: webkit moz o ms official)
/*
* Vendor "box-flex-group" support.
View
@@ -17,9 +17,6 @@ section div {
-moz-box-flex: 1;
-o-box-flex: 1;
-ms-box-flex: 1;
- -webkit-box-flex: 1;
- -moz-box-flex: 1;
- -ms-box-flex: 1;
box-flex: 1;
-webkit-flex: 1 0;
flex: 1 0;

0 comments on commit 545c9d1

Please sign in to comment.