Skip to content

Commit 38dab8c

Browse files
committed
[css-flexbox] Provide more specific links to the min-content contribution/etc for flex items. Fixes #1419
1 parent 687f793 commit 38dab8c

1 file changed

Lines changed: 21 additions & 21 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2778,12 +2778,12 @@ Flex Container Intrinsic Main Sizes</h4>
27782778

27792779
The <strong><a>max-content</a> <a>main size</a> of a <a>flex container</a></strong>
27802780
is the smallest size the <a>flex container</a> can take
2781-
while maintaining the <a>max-content contributions</a> of its <a>flex items</a>:
2781+
while maintaining the [[#intrinsic-item-contributions|max-content contributions]] of its <a>flex items</a>:
27822782

27832783
<ol>
27842784
<li>
27852785
For each <a>flex item</a>,
2786-
subtract its outer <a>flex base size</a> from its <a>max-content contribution</a> size.
2786+
subtract its outer <a>flex base size</a> from its [[#intrinsic-item-contributions|max-content contribution]] size.
27872787
If that result is not zero, divide it by (if the result was positive) its <a>flex grow factor</a> floored at 1,
27882788
or (if the result was negative) by its <a>scaled flex shrink factor</a>, having floored the <a>flex shrink factor</a> at 1.
27892789
This is the item's <var>max-content flex fraction</var>.
@@ -2809,10 +2809,10 @@ Flex Container Intrinsic Main Sizes</h4>
28092809

28102810
The <strong><a>min-content</a> <a>main size</a></strong> of a <em><a>single-line</a></em> flex container
28112811
is calculated identically to the <a>max-content</a> <a>main size</a>,
2812-
except that the <a>flex item’s</a> <a>min-content contribution</a> is used
2813-
instead of its <a>max-content contribution</a>.
2812+
except that the <a>flex item’s</a> [[#intrinsic-item-contributions|min-content contribution]] is used
2813+
instead of its [[#intrinsic-item-contributions|max-content contribution]].
28142814
However, for a <em><a>multi-line</a></em> container,
2815-
it is simply the largest <a>min-content contribution</a>
2815+
it is simply the largest [[#intrinsic-item-contributions|min-content contribution]]
28162816
of all the <a>flex items</a> in the <a>flex container</a>.
28172817

28182818
<h4 id='intrinsic-cross-sizes'>
@@ -3896,42 +3896,42 @@ Substantive Changes and Bugfixes</h4>
38963896

38973897
<blockquote>
38983898
<p><del>When a flex container has multiple lines,</del>
3899-
<ins>In a <i>multi-line</i> <i>flex container</i> (even one with only a single line),</ins>
3900-
the <i>cross size</i> of each line is the minimum size necessary [...]
3901-
<del>When a flex container (even a <i>multi-line</i> one) has only one line,</del>
3902-
<ins>In a <i>single-line</i> <i>flex container</i>,</ins>
3903-
the <i>cross size</i> of the line is the <i>cross size</i> of the flex container,
3899+
<ins>In a <a>multi-line</a> <a>flex container</a> (even one with only a single line),</ins>
3900+
the <a>cross size</a> of each line is the minimum size necessary [...]
3901+
<del>When a flex container (even a <a>multi-line</a> one) has only one line,</del>
3902+
<ins>In a <a>single-line</a> <a>flex container</a>,</ins>
3903+
the <a>cross size</a> of the line is the <a>cross size</a> of the flex container,
39043904
and 'align-content' has no effect.
39053905
</blockquote>
39063906

39073907
<blockquote>
39083908
<p class="note">Note, this property has no effect
39093909
<del>when the flex container has only a single line.</del>
3910-
<ins>on a <i>single-line</i> <i>flex container</i>.</ins>
3910+
<ins>on a <a>single-line</a> <a>flex container</a>.</ins>
39113911
</blockquote>
39123912

39133913
<blockquote>
39143914
<p class="note">Only <del>flex containers with multiple lines</del>
3915-
<ins><i>multi-line</i> <i>flex containers</i></ins>
3916-
ever have free space in the <i>cross-axis</i> for lines to be aligned in,
3915+
<ins><a>multi-line</a> <a>flex containers</a></ins>
3916+
ever have free space in the <a>cross-axis</a> for lines to be aligned in,
39173917
because in a <del>flex container with a single line</del>
3918-
<ins><i>single-line</i> flex container</ins>
3918+
<ins><a>single-line</a> flex container</ins>
39193919
the sole line automatically stretches to fill the space.
39203920
</blockquote>
39213921

39223922
<blockquote>
3923-
<p>If the flex container <del>has only one <i>flex line</i>
3924-
(even if it's a <i>multi-line</i> <i>flex container</i>)</del>
3925-
<ins>is <i>single-line</i></ins>
3926-
and has a <i>definite</i> <i>cross size</i>,
3927-
the <i>cross size</i> of the <i>flex line</i>
3928-
is the <i>flex container</i>'s inner <i>cross size</i>.
3923+
<p>If the flex container <del>has only one <a>flex line</a>
3924+
(even if it's a <a>multi-line</a> <a>flex container</a>)</del>
3925+
<ins>is <a>single-line</a></ins>
3926+
and has a <a>definite</a> <a>cross size</a>,
3927+
the <a>cross size</a> of the <a>flex line</a>
3928+
is the <a>flex container</a>'s inner <a>cross size</a>.
39293929
</blockquote>
39303930

39313931
<blockquote>
39323932
<p>If the flex container <del>has only one flex line
39333933
(even if it's a multi-line flex container),</del>
3934-
<ins>is <i>single-line</i>,</ins>
3934+
<ins>is <a>single-line</a>,</ins>
39353935
then clamp the line's cross-size to be within the container's computed min and max cross-size properties.
39363936
</blockquote>
39373937

0 commit comments

Comments
 (0)