Index: LayoutTests/css3/flexbox/orthogonal-flex-directions.html |
diff --git a/LayoutTests/css3/flexbox/orthogonal-flex-directions.html b/LayoutTests/css3/flexbox/orthogonal-flex-directions.html |
index e4be84471c1c1f9a957e2c16a50fd750e7221c6b..1a475bd16dd8585c309d4ab40731b3b2800bdfe0 100644 |
--- a/LayoutTests/css3/flexbox/orthogonal-flex-directions.html |
+++ b/LayoutTests/css3/flexbox/orthogonal-flex-directions.html |
@@ -6,12 +6,12 @@ body { |
} |
.flexbox { |
width: 600px; |
- display: -webkit-flex; |
+ display: flex; |
background-color: #aaa; |
position: relative; |
} |
.flexbox > * { |
- -webkit-flex: none; |
+ flex: none; |
} |
.flexbox > :nth-child(1) { |
background-color: blue; |
@@ -35,7 +35,7 @@ body { |
} |
.nested { |
- display: -webkit-flex; |
+ display: flex; |
background-color: #ddd; |
} |
@@ -52,17 +52,17 @@ body { |
-webkit-writing-mode: vertical-lr; |
} |
.row-reverse { |
- -webkit-flex-flow: row-reverse; |
+ flex-flow: row-reverse; |
} |
.column { |
- -webkit-flex-flow: column; |
+ flex-flow: column; |
} |
.column-reverse { |
- -webkit-flex-flow: column-reverse; |
+ flex-flow: column-reverse; |
} |
.align-start { |
- -webkit-align-self: flex-start; |
+ align-self: flex-start; |
} |
</style> |
<script src="../../resources/check-layout.js"></script> |
@@ -70,61 +70,61 @@ body { |
<div class="flexbox"> |
<div class="column nested"> |
- <div data-expected-height="50" style="-webkit-flex: 1 0 0; width: 100px;"></div> |
- <div data-expected-height="50" style="-webkit-flex: 1 0 0; width: 100px;"></div> |
+ <div data-expected-height="50" style="flex: 1 0 0; width: 100px;"></div> |
+ <div data-expected-height="50" style="flex: 1 0 0; width: 100px;"></div> |
</div> |
- <div data-expected-width="500" style="-webkit-flex: 1 0 0; height:100px;"></div> |
+ <div data-expected-width="500" style="flex: 1 0 0; height:100px;"></div> |
</div> |
<div class="flexbox"> |
<div class="column nested align-start"> |
- <div data-expected-height="0" style="-webkit-flex: 1 0 0; width: 100px;"></div> |
- <div data-expected-height="0" style="-webkit-flex: 1 0 0; width: 100px;"></div> |
+ <div data-expected-height="0" style="flex: 1 0 0; width: 100px;"></div> |
+ <div data-expected-height="0" style="flex: 1 0 0; width: 100px;"></div> |
</div> |
- <div data-expected-width="500" style="-webkit-flex: 1 0 0; height:100px;"></div> |
+ <div data-expected-width="500" style="flex: 1 0 0; height:100px;"></div> |
</div> |
<div class="flexbox"> |
<div class="column nested align-start" style="height: 50px"> |
- <div data-expected-height="25" style="-webkit-flex: 1 0 0; width: 100px;"></div> |
- <div data-expected-height="25" style="-webkit-flex: 1 0 0; width: 100px;"></div> |
+ <div data-expected-height="25" style="flex: 1 0 0; width: 100px;"></div> |
+ <div data-expected-height="25" style="flex: 1 0 0; width: 100px;"></div> |
</div> |
- <div data-expected-width="500" style="-webkit-flex: 1 0 0; height:100px;"></div> |
+ <div data-expected-width="500" style="flex: 1 0 0; height:100px;"></div> |
</div> |
<div class="flexbox"> |
<div class="column nested" style="height: 50px"> |
- <div class="nested" style="-webkit-flex: 1; width: 100px;"> |
- <div data-expected-height="25" style="-webkit-flex: 1 0 auto;"></div> |
- <div data-expected-height="25" style="-webkit-flex: 1 0 auto;"></div> |
+ <div class="nested" style="flex: 1; width: 100px;"> |
+ <div data-expected-height="25" style="flex: 1 0 auto;"></div> |
+ <div data-expected-height="25" style="flex: 1 0 auto;"></div> |
</div> |
- <div style="-webkit-flex: 1;"></div> |
+ <div style="flex: 1;"></div> |
</div> |
- <div data-expected-width="500" style="-webkit-flex: 1 0 0; height:100px;"></div> |
+ <div data-expected-width="500" style="flex: 1 0 0; height:100px;"></div> |
</div> |
<div class="flexbox column" style="height: 100px"> |
- <div class="row-reverse nested" style="-webkit-flex: 1; width: 100px;"> |
- <div data-expected-width="50" style="-webkit-flex: 1 0 auto;"></div> |
- <div data-expected-width="50" style="-webkit-flex: 1 0 auto;"></div> |
+ <div class="row-reverse nested" style="flex: 1; width: 100px;"> |
+ <div data-expected-width="50" style="flex: 1 0 auto;"></div> |
+ <div data-expected-width="50" style="flex: 1 0 auto;"></div> |
</div> |
- <div data-expected-height="50" style="-webkit-flex: 1 0 0;"></div> |
+ <div data-expected-height="50" style="flex: 1 0 0;"></div> |
</div> |
<div class="flexbox column-reverse" style="height: 100px"> |
- <div class="row-reverse nested" style="-webkit-flex: 1; width: 100px;"> |
- <div data-expected-width="50" style="-webkit-flex: 1 0 auto;"></div> |
- <div data-expected-width="50" style="-webkit-flex: 1 0 auto;"></div> |
+ <div class="row-reverse nested" style="flex: 1; width: 100px;"> |
+ <div data-expected-width="50" style="flex: 1 0 auto;"></div> |
+ <div data-expected-width="50" style="flex: 1 0 auto;"></div> |
</div> |
- <div data-expected-height="50" style="-webkit-flex: 1 0 0;"></div> |
+ <div data-expected-height="50" style="flex: 1 0 0;"></div> |
</div> |
<div class="flexbox vertical-lr" style="height: 100px"> |
- <div class="column nested" style="-webkit-flex: 1; width: 100px;"> |
- <div data-expected-width="50" style="-webkit-flex: 1 0 auto;"></div> |
- <div data-expected-width="50" style="-webkit-flex: 1 0 auto;"></div> |
+ <div class="column nested" style="flex: 1; width: 100px;"> |
+ <div data-expected-width="50" style="flex: 1 0 auto;"></div> |
+ <div data-expected-width="50" style="flex: 1 0 auto;"></div> |
</div> |
- <div data-expected-height="50" style="-webkit-flex: 1 0 0;"></div> |
+ <div data-expected-height="50" style="flex: 1 0 0;"></div> |
</div> |
</body> |