| Index: LayoutTests/css3/flexbox/flexbox-baseline.html
|
| diff --git a/LayoutTests/css3/flexbox/flexbox-baseline.html b/LayoutTests/css3/flexbox/flexbox-baseline.html
|
| index 1c0170d009eeaea0c74cf5e4524e99ed9c2c33e2..802a403c0e53fbf09b43e023807dc8f73d220353 100644
|
| --- a/LayoutTests/css3/flexbox/flexbox-baseline.html
|
| +++ b/LayoutTests/css3/flexbox/flexbox-baseline.html
|
| @@ -5,20 +5,20 @@ body {
|
| margin: 0;
|
| }
|
| .inline-flexbox {
|
| - display: -webkit-inline-flex;
|
| + display: inline-flex;
|
| background-color: lightgrey;
|
| margin-top: 5px;
|
| }
|
| .flexbox {
|
| - display: -webkit-flex;
|
| + display: flex;
|
| background-color: grey;
|
| margin-top: 10px;
|
| }
|
| .column {
|
| - -webkit-flex-flow: column;
|
| + flex-flow: column;
|
| }
|
| .column-reverse {
|
| - -webkit-flex-flow: column-reverse;
|
| + flex-flow: column-reverse;
|
| }
|
| </style>
|
|
|
| @@ -30,9 +30,9 @@ of those flex items. -->
|
| <div>
|
| before text
|
| <div class="inline-flexbox" style="height: 50px;">
|
| - <div style="-webkit-align-self: flex-end">below</div>
|
| - <div style="-webkit-align-self: baseline; margin-top: 15px">baseline</div>
|
| - <div style="-webkit-align-self: flex-start">above</div>
|
| + <div style="align-self: flex-end">below</div>
|
| + <div style="align-self: baseline; margin-top: 15px">baseline</div>
|
| + <div style="align-self: flex-start">above</div>
|
| </div>
|
| after text
|
| </div>
|
| @@ -43,9 +43,9 @@ item's baseline. -->
|
| <div>
|
| before text
|
| <div class="inline-flexbox" style="height: 40px">
|
| - <div style="-webkit-align-self: flex-end">baseline</div>
|
| - <div style="-webkit-align-self: baseline; -webkit-writing-mode: vertical-rl"></div>
|
| - <div style="-webkit-align-self: flex-start">above</div>
|
| + <div style="align-self: flex-end">baseline</div>
|
| + <div style="align-self: baseline; -webkit-writing-mode: vertical-rl"></div>
|
| + <div style="align-self: flex-start">above</div>
|
| </div>
|
| after text
|
| </div>
|
| @@ -143,7 +143,7 @@ after text
|
| before text
|
| <div class="inline-flexbox" style="height: 40px;">
|
| <div>baseline</div>
|
| - <div style="-webkit-align-self: baseline; margin-top: auto">below</div>
|
| + <div style="align-self: baseline; margin-top: auto">below</div>
|
| </div>
|
| after text
|
| </div>
|
| @@ -153,7 +153,7 @@ before text
|
| <div style="display: inline-block">
|
| <div class="inline-flexbox" style="height: 40px;">
|
| <div>above</div>
|
| - <div style="-webkit-align-self: baseline; margin-top: 10px">baseline</div>
|
| + <div style="align-self: baseline; margin-top: 10px">baseline</div>
|
| <div>above</div>
|
| </div>
|
| after
|
| @@ -205,7 +205,7 @@ as being in its initial scroll position when computing the baseline. -->
|
| <div>
|
| before text
|
| <div id="flexbox-with-scrollbar" class="inline-flexbox" style="height: 65px; width: 150px">
|
| - <div id="flexitem-with-scrollbar" style="-webkit-align-self: baseline; padding-top: 15px; height: 50px; overflow-y: scroll;">
|
| + <div id="flexitem-with-scrollbar" style="align-self: baseline; padding-top: 15px; height: 50px; overflow-y: scroll;">
|
| The baseline is based on<br>
|
| the non-scrolled position;<br>
|
| this won't line up.
|
|
|