Skip to content

Commit aced43e

Browse files
committed
Tweak the line-breaking calculations.
1 parent ecd1320 commit aced43e

2 files changed

Lines changed: 10 additions & 8 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,21 +1842,23 @@ <h2 id=layout-algorithm><span class=secno>7. </span> Flexbox Layout
18421842

18431843
<dt>size doesn't rely on its contents
18441844

1845-
<dd>The maximum line length is main size of the flexbox's content box.
1845+
<dd>The maximum line length is main size of the flexbox's content box,
1846+
constrained by the min and max main size constraints of the flexbox.
18461847

18471848
<dt>&lsquo;<code class=css>min-content</code>&rsquo;
18481849

18491850
<dd>The maximum line length is the flexbox's minimum main size.
18501851

18511852
<dt>&lsquo;<code class=css>max-content</code>&rsquo;
18521853

1853-
<dd>The maximum line length is the flexbox's maximum main size, or
1854-
infinity if it has no maximum main size.
1854+
<dd>The maximum line length is infinity, constrained by the main and
1855+
max main size constraints of the flexbox.
18551856

18561857
<dt>&lsquo;<code class=css>fit-content</code>&rsquo;
18571858

1858-
<dd>Same as if the flexbox was sized as &lsquo;<code
1859-
class=css>fill-available</code>&rsquo;.
1859+
<dd>The maximum line length is the greater of the flexbox's main size
1860+
constraint and the smaller of the flexbox's maximum size constraint
1861+
and the available space.
18601862
</dl>
18611863

18621864
<li>Collect as many consecutive flexbox items as possible, starting from

css3-flexbox/Overview.src.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -903,16 +903,16 @@ <h2 id='layout-algorithm'>
903903

904904
<dt>
905905
<dt>size doesn't rely on its contents</dt>
906-
<dd>The maximum line length is main size of the flexbox's content box.</dd>
906+
<dd>The maximum line length is main size of the flexbox's content box, constrained by the min and max main size constraints of the flexbox.</dd>
907907

908908
<dt>''min-content''</dt>
909909
<dd>The maximum line length is the flexbox's minimum main size.</dd>
910910

911911
<dt>''max-content''</dt>
912-
<dd>The maximum line length is the flexbox's maximum main size, or infinity if it has no maximum main size.</dd>
912+
<dd>The maximum line length is infinity, constrained by the main and max main size constraints of the flexbox.</dd>
913913

914914
<dt>''fit-content''</dt>
915-
<dd>Same as if the flexbox was sized as ''fill-available''.</dd>
915+
<dd>The maximum line length is the greater of the flexbox's main size constraint and the smaller of the flexbox's maximum size constraint and the available space.</dd>
916916
</dt>
917917
</li>
918918

0 commit comments

Comments
 (0)