Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(275)

Unified Diff: LayoutTests/css3/flexbox/flex-algorithm-with-margins.html

Issue 1088633002: Unprefix flexbox tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: whoops, a > went missing Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/css3/flexbox/flex-algorithm-min-max.html ('k') | LayoutTests/css3/flexbox/flex-align.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/css3/flexbox/flex-algorithm-with-margins.html
diff --git a/LayoutTests/css3/flexbox/flex-algorithm-with-margins.html b/LayoutTests/css3/flexbox/flex-algorithm-with-margins.html
index 7666181cdffa8b50292a86beeb5d708e03ca7bb9..6e8128fff2a77fa5ad3467288ca60bc44773f1c7 100644
--- a/LayoutTests/css3/flexbox/flex-algorithm-with-margins.html
+++ b/LayoutTests/css3/flexbox/flex-algorithm-with-margins.html
@@ -26,24 +26,19 @@ body {
}
.flex1 {
- -webkit-flex: 1;
- -moz-flex: 1;
+ flex: 1;
}
.flex2 {
- -webkit-flex: 2;
- -moz-flex: 2;
+ flex: 2;
}
.flex4 {
- -webkit-flex: 4;
- -moz-flex: 4;
+ flex: 4;
}
.flex1-0-0 {
- -webkit-flex: 1 0 0px;
- -moz-flex: 1 0 0px;
+ flex: 1 0 0px;
}
.flex2-0-0 {
- -webkit-flex: 2 0 0px;
- -moz-flex: 2 0 0px;
+ flex: 2 0 0px;
}
</style>
<script src="../../resources/check-layout.js"></script>
@@ -69,28 +64,28 @@ body {
<div class="flexbox">
<div data-expected-width="100" class="flex1-0-0"></div>
- <div data-expected-width="300" data-offset-x="100" style="-webkit-flex: 2 0 100px; -moz-flex: 2 0 100px; margin-left: auto;"></div>
+ <div data-expected-width="300" data-offset-x="100" style="flex: 2 0 100px; margin-left: auto;"></div>
<div data-expected-width="100" data-offset-x="400" class="flex1-0-0" style="margin-right: 100px"></div>
</div>
<!-- Margins set to auto don't have negative flex. -->
<div class="flexbox">
- <div data-expected-width="150" style="-webkit-flex: 1 1 300px; -moz-flex: 1 1 300px"></div>
- <div data-expected-width="300" data-offset-x="150" style="-webkit-flex: 1 0 300px; -moz-flex: 1 0 300px; margin: 0 auto;"></div>
- <div data-expected-width="150" data-offset-x="450" style="-webkit-flex: 1 1 300px; -moz-flex: 1 1 300px"></div>
+ <div data-expected-width="150" style="flex: 1 1 300px;"></div>
+ <div data-expected-width="300" data-offset-x="150" style="flex: 1 0 300px; margin: 0 auto;"></div>
+ <div data-expected-width="150" data-offset-x="450" style="flex: 1 1 300px;"></div>
</div>
<div class="flexbox">
- <div data-expected-width="300" data-offset-x="150" style="-webkit-flex: 0 0 300px; -moz-flex: 0 0 300px; margin: 0 auto;"></div>
+ <div data-expected-width="300" data-offset-x="150" style="flex: 0 0 300px; margin: 0 auto;"></div>
</div>
<!-- margin: auto safe centers, which means it won't overflow to before the start of the flexbox. -->
<div class="flexbox">
- <div data-expected-width="700" data-offset-x="0" style="-webkit-flex: 0 0 700px; -moz-flex: 0 0 700px; margin: 0 auto;"></div>
+ <div data-expected-width="700" data-offset-x="0" style="flex: 0 0 700px; margin: 0 auto;"></div>
</div>
<div class="flexbox">
- <div data-expected-width="600" data-offset-x="0" style="-webkit-flex: 1 0 300px; -moz-flex: 1 0 300px; margin: 0 auto;"></div>
+ <div data-expected-width="600" data-offset-x="0" style="flex: 1 0 300px; margin: 0 auto;"></div>
</div>
<div class="flexbox">
@@ -105,8 +100,8 @@ body {
</div>
<div class="flexbox" style="padding: 100px;">
- <div data-expected-width="300" data-offset-x="100" style="-webkit-flex: 1 0 0px; -moz-flex: 1 0 0px; margin: 0 auto;"></div>
- <div data-expected-width="300" data-offset-x="400" style="-webkit-flex: 1 0 0em; -moz-flex: 1 0 0em; margin: 0 auto;"></div>
+ <div data-expected-width="300" data-offset-x="100" style="flex: 1 0 0px; margin: 0 auto;"></div>
+ <div data-expected-width="300" data-offset-x="400" style="flex: 1 0 0em; margin: 0 auto;"></div>
</div>
<div class="flexbox">
« no previous file with comments | « LayoutTests/css3/flexbox/flex-algorithm-min-max.html ('k') | LayoutTests/css3/flexbox/flex-align.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698