Skip to content

Commit 7393e02

Browse files
committed
[css-flexbox] Fix some copy-paste errors. Fix some broken links. <http://www.w3.org/mid/5480D039.8020406@mozilla.com>
1 parent 129f2c1 commit 7393e02

2 files changed

Lines changed: 4653 additions & 2189 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,22 +2308,22 @@ Line Length Determination</h3>
23082308
If the flex item has ...
23092309
<ul>
23102310
<li>an intrinsic aspect ratio,
2311-
<li>a used <a>flex basis</a> of ''width/auto'', and
2311+
<li>a used <a>flex basis</a> of ''content'', and
23122312
<li>a <a>definite</a> <a>cross size</a>
23132313
</ul>
23142314
then the <a>flex base size</a> is calculated from its inner <a>cross size</a>
23152315
and the <a>flex item</a>’s intrinsic aspect ratio.
23162316

23172317
<li>
2318-
If the used <a>flex basis</a> is <a value for=width>auto</a> or depends on its available size,
2318+
If the used <a>flex basis</a> is ''content'' or depends on its available size,
23192319
and the flex container is being sized under a min-content or max-content constraint
23202320
(e.g. when performing <a href="http://www.w3.org/TR/CSS21/tables.html#auto-table-layout">automatic table layout</a> [[!CSS21]]),
23212321
size the item under that constraint.
23222322
The <a>flex base size</a> is the item's resulting main size.
23232323

23242324
<li>
23252325
Otherwise,
2326-
if the used <a>flex basis</a> is <a value for=width>auto</a> or depends on its available size,
2326+
if the used <a>flex basis</a> is ''content'' or depends on its available size,
23272327
the available main size is infinite,
23282328
and the flex item's inline axis is parallel to the main axis,
23292329
lay the item out using
@@ -2334,11 +2334,11 @@ Line Length Determination</h3>
23342334
Otherwise,
23352335
lay out the item into the <a>available space</a>
23362336
using its used <a>flex basis</a> in place of its <a>main size</a>,
2337-
treating a <a>main size</a> of <a value for=width>auto</a> as ''max-content''.
2337+
treating a value of ''content'' as ''width/max-content''.
23382338
If a <a>cross size</a> is needed to determine the <a>main size</a>
23392339
(e.g. when the <a>flex item</a>’s <a>main size</a> is in its block axis)
23402340
and the <a>flex item</a>’s cross size is ''auto'' and not <a>definite</a>,
2341-
in this calculation use ''fit-content'' as the <a>flex item</a>’s <a>cross size</a>.
2341+
in this calculation use ''width/fit-content'' as the <a>flex item</a>’s <a>cross size</a>.
23422342
The <a>flex base size</a> is the item's resulting <a>main size</a>.
23432343

23442344
</ol>
@@ -3011,7 +3011,8 @@ Sample Flex Fragmentation Algorithm</h3>
30113011
<ol>
30123012
<li>
30133013
Run the entire flex layout algorithm (without regards to pagination),
3014-
except treat any 'align-self' other than ''start'' or ''baseline'' as ''start''.
3014+
except treat any 'align-self' other than ''align-self/flex-start'' or ''baseline''
3015+
as ''align-self/flex-start''.
30153016

30163017
<li>
30173018
If an unbreakable item doesn't fit within the space left on the page,
@@ -3039,7 +3040,7 @@ Sample Flex Fragmentation Algorithm</h3>
30393040
from <a href="#cross-alignment">Cross-Axis Alignment</a>
30403041
to its finish.
30413042
For all fragments besides the first,
3042-
treat 'align-self' and 'align-content' as being ''start'' for all item fragments and lines.
3043+
treat 'align-self' and 'align-content' as being ''align-self/flex-start'' for all item fragments and lines.
30433044

30443045
<li>
30453046
If any item,
@@ -3368,7 +3369,7 @@ Substantive Changes and Bugfixes</h4>
33683369
to force enough size to show all the content.
33693370
<li>Take into account the specified 'width'/'height',
33703371
so that the implied minimum is never greater than the specified size.
3371-
<li>Compute to itself (not to ''min-content'') on flex items,
3372+
<li>Compute to itself (not to ''width/min-content'') on flex items,
33723373
since they are no longer equivalent (due to above changes).
33733374
</ul>
33743375
(<a href="http://dev.w3.org/csswg/css-flexbox-1/issues-cr-2012#issue-19">Issue 19</a>)
@@ -3381,7 +3382,7 @@ Substantive Changes and Bugfixes</h4>
33813382
this keyword indicates a minimum of the min-content size,
33823383
to help ensure that the item is large enough to fit its contents.</p>
33833384
<p class='note'>
3384-
It is intended that this will compute to the ''min-content'' keyword
3385+
It is intended that this will compute to the ''width/min-content'' keyword
33853386
when the specification defining it ([[CSS3-SIZING]]) is sufficiently mature.
33863387
</p>
33873388
</del>
@@ -3457,7 +3458,7 @@ Substantive Changes and Bugfixes</h4>
34573458
<p><ins>If a <a>cross size</a> is needed to determine the <a>main size</a>
34583459
(e.g. when the <a>flex item</a>’s <a>main size</a> is in its block axis)
34593460
and the <a>flex item</a>’s cross size is ''auto'' and not <a>definite</a>,
3460-
in this calculation use ''fit-content'' as the <a>flex item</a>’s <a>cross size</a>.</ins>
3461+
in this calculation use ''height/fit-content'' as the <a>flex item</a>’s <a>cross size</a>.</ins>
34613462
</blockquote>
34623463
<li id="change-2012-intrinsic-sizes">
34633464
Defined the <a href="#intrinsic-sizes">intrinsic sizes of flex containers.</a>

0 commit comments

Comments
 (0)