Skip to content

Commit 293140f

Browse files
committed
Rework layout outline based on convo with Alex. Edits to the actual algorithm to follow.
1 parent 5a7d390 commit 293140f

2 files changed

Lines changed: 18 additions & 9 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,21 +1764,26 @@ <h2 id=layout-algorithm><span class=secno>7. </span> Flexbox Layout
17641764
<li>Reorder flexbox items according to &lsquo;<a
17651765
href="#flex-order0"><code class=property>flex-order</code></a>&rsquo;.
17661766

1767-
<li>Find the "hypothetical size" of every flexbox item.
1767+
<li>Find the hypothetical main size of every flexbox item.
17681768

17691769
<li>Linebreak the flexbox, if it's multi-line.
17701770

17711771
<li>Based on the hypothetical sizes of the items, find the real main size
1772-
of the flexbox and the hypothetical cross size.
1772+
of the flexbox.
17731773

17741774
<li>Resolve any flexible lengths. All items now have a real main size.
17751775

1776-
<li>Align in the main axis, per &lsquo;<a href="#flex-pack0"><code
1777-
class=property>flex-pack</code></a>&rsquo;.
1776+
<li>Update layout for the items based on their real main sizes, and
1777+
determine their hypothetical cross size.
17781778

17791779
<li>Based on &lsquo;<a href="#flex-align0"><code
17801780
class=property>flex-align</code></a>&rsquo;, find the real cross size of
1781-
the flexbox, its lines, and the items.
1781+
the flexbox and its lines.
1782+
1783+
<li>Update layout for the items based on their real cross sizes.
1784+
1785+
<li>Align in the main axis, per &lsquo;<a href="#flex-pack0"><code
1786+
class=property>flex-pack</code></a>&rsquo;.
17821787

17831788
<li>Align in the cross axis, per &lsquo;<a href="#flex-align0"><code
17841789
class=property>flex-align</code></a>&rsquo;.

css3-flexbox/Overview.src.html

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -853,17 +853,21 @@ <h2 id='layout-algorithm'>
853853
<ol>
854854
<li>Reorder flexbox items according to 'flex-order'.</li>
855855

856-
<li>Find the "hypothetical size" of every flexbox item.</li>
856+
<li>Find the hypothetical main size of every flexbox item.</li>
857857

858858
<li>Linebreak the flexbox, if it's multi-line.</li>
859859

860-
<li>Based on the hypothetical sizes of the items, find the real main size of the flexbox and the hypothetical cross size.</li>
860+
<li>Based on the hypothetical sizes of the items, find the real main size of the flexbox.</li>
861861

862862
<li>Resolve any flexible lengths. All items now have a real main size.</li>
863863

864-
<li>Align in the main axis, per 'flex-pack'.</li>
864+
<li>Update layout for the items based on their real main sizes, and determine their hypothetical cross size.</li>
865+
866+
<li>Based on 'flex-align', find the real cross size of the flexbox and its lines.</li>
865867

866-
<li>Based on 'flex-align', find the real cross size of the flexbox, its lines, and the items.</li>
868+
<li>Update layout for the items based on their real cross sizes.</li>
869+
870+
<li>Align in the main axis, per 'flex-pack'.</li>
867871

868872
<li>Align in the cross axis, per 'flex-align'.</li>
869873

0 commit comments

Comments
 (0)