Merge pull request Polymer#80 from Polymer/basis

Force flex-basis to be 0; avoid x-browser bugs by using a sub-pixel valu...
nevir · Aug 20, 2014 · 06af60d · 06af60d
2 parents 73801fc + 08dc2dc
commit 06af60d
Showing 1 changed file with 40 additions and 40 deletions.
diff --git a/layout.html b/layout.html
@@ -60,9 +60,9 @@
 }
 
 html /deep/ [flex] {
-  -ms-flex: 1;
-  -webkit-flex: 1;
-  flex: 1;
+  -ms-flex: 1 1 0.00000000001px;
+  -webkit-flex: 1 1 0.00000000001px;
+  flex: 1 1 0.00000000001px;
 }
 
 html /deep/ [flex][auto] {
@@ -78,75 +78,75 @@
 }
 
 html /deep/ [flex][one] {
-  -ms-flex: 1;
-  -webkit-flex: 1;
-  flex: 1;
+  -ms-flex: 1 1 0.00000000001px;
+  -webkit-flex: 1 1 0.00000000001px;
+  flex: 1 1 0.00000000001px;
 }
 
 html /deep/ [flex][two] {
-  -ms-flex: 2;
-  -webkit-flex: 2;
-  flex: 2;
+  -ms-flex: 2 2 0.00000000001px;
+  -webkit-flex: 2 2 0.00000000001px;
+  flex: 2 2 0.00000000001px;
 }
 
 html /deep/ [flex][three] {
-  -ms-flex: 3;
-  -webkit-flex: 3;
-  flex: 3;
+  -ms-flex: 3 3 0.00000000001px;
+  -webkit-flex: 3 3 0.00000000001px;
+  flex: 3 3 0.00000000001px;
 }
 
 html /deep/ [flex][four] {
-  -ms-flex: 4;
-  -webkit-flex: 4;
-  flex: 4;
+  -ms-flex: 4 4 0.00000000001px;
+  -webkit-flex: 4 4 0.00000000001px;
+  flex: 4 4 0.00000000001px;
 }
 
 html /deep/ [flex][five] {
-  -ms-flex: 5;
-  -webkit-flex: 5;
-  flex: 5;
+  -ms-flex: 5 5 0.00000000001px;
+  -webkit-flex: 5 5 0.00000000001px;
+  flex: 5 5 0.00000000001px;
 }
 
 html /deep/ [flex][six] {
-  -ms-flex: 6;
-  -webkit-flex: 6;
-  flex: 6;
+  -ms-flex: 6 6 0.00000000001px;
+  -webkit-flex: 6 6 0.00000000001px;
+  flex: 6 6 0.00000000001px;
 }
 
 html /deep/ [flex][seven] {
-  -ms-flex: 7;
-  -webkit-flex: 7;
-  flex: 7;
+  -ms-flex: 7 7 0.00000000001px;
+  -webkit-flex: 7 7 0.00000000001px;
+  flex: 7 7 0.00000000001px;
 }
 
 html /deep/ [flex][eight] {
-  -ms-flex: 8;
-  -webkit-flex: 8;
-  flex: 8;
+  -ms-flex: 8 8 0.00000000001px;
+  -webkit-flex: 8 8 0.00000000001px;
+  flex: 8 8 0.00000000001px;
 }
 
 html /deep/ [flex][nine] {
-  -ms-flex: 9;
-  -webkit-flex: 9;
-  flex: 9;
+  -ms-flex: 9 9 0.00000000001px;
+  -webkit-flex: 9 9 0.00000000001px;
+  flex: 9 9 0.00000000001px;
 }
 
 html /deep/ [flex][ten] {
-  -ms-flex: 10;
-  -webkit-flex: 10;
-  flex: 10;
+  -ms-flex: 10 10 0.00000000001px;
+  -webkit-flex: 10 10 0.00000000001px;
+  flex: 10 10 0.00000000001px;
 }
 
 html /deep/ [flex][eleven] {
-  -ms-flex: 11;
-  -webkit-flex: 11;
-  flex: 11;
+  -ms-flex: 11 11 0.00000000001px;
+  -webkit-flex: 11 11 0.00000000001px;
+  flex: 11 11 0.00000000001px;
 }
 
 html /deep/ [flex][twelve] {
-  -ms-flex: 12;
-  -webkit-flex: 12;
-  flex: 12;
+  -ms-flex: 12 12 0.00000000001px;
+  -webkit-flex: 12 12 0.00000000001px;
+  flex: 12 12 0.00000000001px;
 }
 
 /* alignment in cross axis */
@@ -190,7 +190,7 @@
 }
 
 html /deep/ [layout][around-justified] {
-  -ms-flex-pack: around;
+  -ms-flex-pack: distribute;
   -webkit-justify-content: space-around;
   justify-content: space-around;
 }