Auto merge of #27339 - Manishearth:flex-align-items, r=pcwalton

flexbox 2020: Implement `align-items` and `align-self`, excluding `baseline`

This PR is based on https://github.com/servo/servo/pull/27334 for ease of testing

`baseline` is tricky and involves keeping track of a "baseline set"

https://drafts.csswg.org/css-flexbox/#flex-baselines

Part of https://github.com/servo/servo/issues/26639
This commit is contained in:
bors-servo 2020-07-21 02:36:48 -04:00 committed by GitHub
commit c02da14847
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 103 additions and 189 deletions

View file

@ -0,0 +1,41 @@
<style type="text/css">
#box {
display: flex;
align-items: center;
}
#box>div {
background-color: yellow;
margin: 2px;
border: 1px solid black;
}
#a div {
height: 20px;
}
#b div {
height: 50px;
}
#c div,#d div,#e div {
height: 30px;
}
#a {
align-self: stretch;
}
#d {
align-self: flex-end;
}
#e {
align-self: flex-start;
}
</style>
<div id=box>
<div id=a><div>A</div></div>
<div id=b><div>B</div></div>
<div id=c><div>C</div></div>
<div id=d><div>D</div></div>
<div id=e><div>E</div></div>
</div>

View file

@ -1,2 +0,0 @@
[align-content-002.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-content_flex-start.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-items-001.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-items-002.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-items-003.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-001.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-003.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-007.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-008.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-009.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[align-self-013.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[dynamic-change-simplified-layout-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[fit-content-item-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[fit-content-item-003.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[fit-content-item-004.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-001.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-002.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-003.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-004.htm]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-basis-001.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-basis-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-basis-003.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-basis-004.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-basis-007.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-basis-008.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-box-wrap.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-container-margin.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-flow-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-flow-003.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-flow-005.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-flow-006.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-grow-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-grow-004.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-grow-006.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-grow-007.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-001.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-003.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-004.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-005.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-006.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-007.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-shrink-008.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flex-wrap-006.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox-flex-wrap-flexing.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-content-flexstart.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-items-center-2.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-items-center.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-items-flexend-2.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-items-flexend.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-items-flexstart-2.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-items-flexstart.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-self-auto.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-self-baseline.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-self-center.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-self-flexend.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-self-flexstart.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_align-self-stretch.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_box-clear.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexbox_fbfc.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[flexible-box-float.html]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-items-baseline.html]
[flexbox | computed style | align-items: baseline]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-items-center.html]
[flexbox | computed style | align-items: center]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-items-flex-end.html]
[flexbox | computed style | align-items: flex-end]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-items-flex-start.html]
[flexbox | computed style | align-items: flex-start]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-items-stretch.html]
[flexbox | computed style | align-items: stretch]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-self-baseline.html]
[flexbox | computed style | align-self: baseline]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-self-center.html]
[flexbox | computed style | align-self: center]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-self-flex-end.html]
[flexbox | computed style | align-self: flex-end]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-self-flex-start.html]
[flexbox | computed style | align-self: flex-start]
expected: FAIL

View file

@ -1,4 +0,0 @@
[flexbox_computedstyle_align-self-stretch.html]
[flexbox | computed style | align-self: stretch]
expected: FAIL

View file

@ -11,9 +11,6 @@
[Property justify-content has initial value normal]
expected: FAIL
[Property align-items does not inherit]
expected: FAIL
[Property align-self has initial value auto]
expected: FAIL

View file

@ -1,2 +0,0 @@
[layout-algorithm_algo-cross-line-001.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[order-painting.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[overflow-area-001.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[overflow-area-002.html]
expected: FAIL

View file

@ -1,2 +0,0 @@
[table-as-item-change-cell.html]
expected: FAIL