Skip to content

Commit 8960d0f

Browse files
committed
Specify more explicitly that flex-order reordering is done before baseline computation.
1 parent 8b54620 commit 8960d0f

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -504,19 +504,22 @@ <h2 id=display-flexbox><span class=secno>3. </span> New values for
504504

505505
<ul>
506506
<li> If any of the <a href="#flexbox-item"><i>flexbox items</i></a> on the
507-
flexbox's first line have a computed value of &lsquo;<a
508-
href="#flex-align-baseline"><code class=css>baseline</code></a>&rsquo;
509-
for &lsquo;<a href="#flex-item-align"><code
507+
flexbox's first line (after reordering with &lsquo;<a
508+
href="#flex-order0"><code class=property>flex-order</code></a>&rsquo;)
509+
have a computed value of &lsquo;<a href="#flex-align-baseline"><code
510+
class=css>baseline</code></a>&rsquo; for &lsquo;<a
511+
href="#flex-item-align"><code
510512
class=property>flex-item-align</code></a>&rsquo;, the flexbox's baseline
511513
is the baseline of those <a href="#flexbox-item"><i>flexbox
512514
items</i></a>.
513515

514516
<li> Otherwise, if the flexbox has at least one <a
515-
href="#flexbox-item"><i>flexbox item</i></a>, and its first <a
516-
href="#flexbox-item"><i>flexbox item</i></a>&apos;s baseline is parallel
517-
to the flexbox's <a href="#main-axis"><i>main axis</i></a>, the flexbox's
518-
baseline is the baseline of its first <a href="#flexbox-item"><i>flexbox
519-
item</i></a>.
517+
href="#flexbox-item"><i>flexbox item</i></a>, and the baseline of its
518+
first <a href="#flexbox-item"><i>flexbox item</i></a> (after reordering
519+
with &lsquo;<a href="#flex-order0"><code
520+
class=property>flex-order</code></a>&rsquo;) is parallel to the flexbox's
521+
<a href="#main-axis"><i>main axis</i></a>, the flexbox's baseline is the
522+
baseline of its first <a href="#flexbox-item"><i>flexbox item</i></a>.
520523

521524
<li> Otherwise, the flexbox's baseline is the "after" edge of its content
522525
box.

css3-flexbox/Overview.src.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,15 @@ <h2 id='display-flexbox'>
176176
<ul>
177177
<li>
178178
If any of the <i>flexbox items</i> on the flexbox's first line
179+
(after reordering with 'flex-order')
179180
have a computed value of ''baseline'' for 'flex-item-align',
180181
the flexbox's baseline is the baseline of those <i>flexbox items</i>.
181182

182183
<li>
183184
Otherwise, if the flexbox has at least one <i>flexbox item</i>,
184-
and its first <i>flexbox item</i>&apos;s baseline is parallel to the flexbox's <i>main axis</i>,
185+
and the baseline of its first <i>flexbox item</i>
186+
(after reordering with 'flex-order')
187+
is parallel to the flexbox's <i>main axis</i>,
185188
the flexbox's baseline is the baseline of its first <i>flexbox item</i>.
186189

187190
<li>

0 commit comments

Comments
 (0)