Skip to content

Commit 042341d

Browse files
committed
[css-flexbox] Clarify non-frozen in several spots.
1 parent a13dc6a commit 042341d

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

css-flexbox/Overview.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2352,8 +2352,7 @@ <h3 class="heading settled heading" data-level=9.7 id=resolve-flexible-lengths><
23522352
<ol>
23532353
<li>
23542354
<strong>Check that you can distribute any space.</strong>
2355-
If all the flex items on the line are either frozen
2356-
or have a flex factor of zero,
2355+
If all the non-frozen flex items on the line have a flex factor of zero,
23572356
exit the algorithm.
23582357

23592358
<li>
@@ -2365,27 +2364,27 @@ <h3 class="heading settled heading" data-level=9.7 id=resolve-flexible-lengths><
23652364
<li>
23662365
<strong>Normalize desired free space if necessary.</strong>
23672366
If the free space is positive,
2368-
and the sum of the <var>desired free spaces</var> of all the flex items on the line
2367+
and the sum of the <var>desired free spaces</var> of all the non-frozen flex items on the line
23692368
is greater than the free space,
23702369
normalize all the <var>desired free spaces</var> so that they sum exactly to the free space
23712370
while maintaining their magnitudes relative to each other.
23722371

23732372
<p> Otherwise, if the free space is negative,
2374-
and the sum of the <var>desired free spaces</var> of all the flex items on the line
2373+
and the sum of the <var>desired free spaces</var> of all the non-frozen flex items on the line
23752374
is less than the free space,
23762375
normalize all the <var>desired free spaces</var> so that they sum exactly to the free space
23772376
while maintaining their magnitudes relative to each other.
23782377

23792378
<li>
23802379
<strong>Adjust main size.</strong>
2381-
Set each item’s used main size
2382-
to its <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> plus its <var>desired free space</var>.
2380+
Set each non-frozen flex item’s used main size
2381+
to the sum of it’s <a data-link-type=dfn href=#flex-base-size title="flex base size">flex base size</a> and it’s <var>desired free space</var>.
23832382

23842383
<p class=note> Note: This may result in a negative main size temporarily.
23852384

23862385
<li>
23872386
<strong>Fix min/max violations.</strong>
2388-
Clamp each item’s main size by its min and max main size properties.
2387+
Clamp each non-frozen item’s main size by its min and max main size properties.
23892388
If the item’s main size was made smaller by this, it’s a max violation.
23902389
If the item’s main size was made larger by this, it’s a min violation.
23912390

css-flexbox/Overview.src.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2339,8 +2339,7 @@ <h3 id='resolve-flexible-lengths'>
23392339
<ol>
23402340
<li>
23412341
<strong>Check that you can distribute any space.</strong>
2342-
If all the flex items on the line are either frozen
2343-
or have a flex factor of zero,
2342+
If all the non-frozen flex items on the line have a flex factor of zero,
23442343
exit the algorithm.
23452344

23462345
<li>
@@ -2352,27 +2351,27 @@ <h3 id='resolve-flexible-lengths'>
23522351
<li>
23532352
<strong>Normalize desired free space if necessary.</strong>
23542353
If the free space is positive,
2355-
and the sum of the <var>desired free spaces</var> of all the flex items on the line
2354+
and the sum of the <var>desired free spaces</var> of all the non-frozen flex items on the line
23562355
is greater than the free space,
23572356
normalize all the <var>desired free spaces</var> so that they sum exactly to the free space
23582357
while maintaining their magnitudes relative to each other.
23592358

23602359
Otherwise, if the free space is negative,
2361-
and the sum of the <var>desired free spaces</var> of all the flex items on the line
2360+
and the sum of the <var>desired free spaces</var> of all the non-frozen flex items on the line
23622361
is less than the free space,
23632362
normalize all the <var>desired free spaces</var> so that they sum exactly to the free space
23642363
while maintaining their magnitudes relative to each other.
23652364

23662365
<li>
23672366
<strong>Adjust main size.</strong>
2368-
Set each item's used main size
2369-
to its <a>flex base size</a> plus its <var>desired free space</var>.
2367+
Set each non-frozen flex item's used main size
2368+
to the sum of it's <a>flex base size</a> and it's <var>desired free space</var>.
23702369

23712370
Note: This may result in a negative main size temporarily.
23722371

23732372
<li>
23742373
<strong>Fix min/max violations.</strong>
2375-
Clamp each item's main size by its min and max main size properties.
2374+
Clamp each non-frozen item's main size by its min and max main size properties.
23762375
If the item's main size was made smaller by this, it's a max violation.
23772376
If the item's main size was made larger by this, it's a min violation.
23782377

0 commit comments

Comments
 (0)