Skip to content

Commit 2c7253b

Browse files
committed
[css3-flexbox] Fix some missing s/ratio/factor/ errors.
1 parent 534e36d commit 2c7253b

2 files changed

Lines changed: 30 additions & 29 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2041,7 +2041,7 @@ <h3 id=flex-property><span class=secno>7.1. </span> The ‘<a
20412041
<a href="#flex-components">longhand</a> and specifies the <dfn
20422042
id=flex-basis>flex basis</dfn>: the initial <a href="#main-size"><i>main
20432043
size</i></a> of the <a href="#flex-item"><i>flex item</i></a>, before
2044-
free space is distributed according to the flex ratios. When omitted
2044+
free space is distributed according to the flex factors. When omitted
20452045
from the ‘<a href="#flex"><code class=property>flex</code></a>
20462046
shorthand, its specified value is the length zero.
20472047

@@ -2055,7 +2055,7 @@ <h3 id=flex-property><span class=secno>7.1. </span> The ‘<a
20552055
src="images/rel-vs-abs-flex.svg" width=504> <figcaption> A diagram
20562056
showing the difference between "absolute" flex (starting from a basis of
20572057
zero) and "relative" flex (starting from a basis of the item's content
2058-
size). The three items have flex ratios of ‘<code
2058+
size). The three items have flex factors of ‘<code
20592059
class=css>1</code>’, ‘<code class=css>1</code>’, and ‘<code
20602060
class=css>2</code>’, respectively. </figcaption> </figure>
20612061

@@ -2083,7 +2083,7 @@ <h3 id=flex-property><span class=secno>7.1. </span> The ‘<a
20832083
<p> A unitless zero that is not already preceded by two flex factors must
20842084
be interpreted as a flex factor. To avoid misinterpretation or invalid
20852085
declarations, authors must specify a zero <var>&lt;flex-basis></var>
2086-
component with a unit or precede it by both flex ratios.
2086+
component with a unit or precede it by two flex factors.
20872087

20882088
<h3 id=flex-common><span class=secno>7.2. </span> Common Values of ‘<a
20892089
href="#flex"><code class=property>flex</code></a></h3>
@@ -2139,7 +2139,7 @@ <h3 id=flex-common><span class=secno>7.2. </span> Common Values of ‘<a
21392139
href="#flex-basis"><i>flex basis</i></a> to zero, resulting in an item
21402140
that receives the specified proportion of the free space in the flex
21412141
container. If all items in the flex container use this pattern, their
2142-
sizes will be proportional to the specified flex ratio.
2142+
sizes will be proportional to the specified flex factor.
21432143
</dl>
21442144

21452145
<p> By default, flex items won't shrink below their minimum content size
@@ -3372,19 +3372,19 @@ <h3 id=resolve-flexible-lengths><span class=secno>9.7. </span> Resolving
33723372
<p> To resolve the flexible lengths of the items within a flex line:
33733373

33743374
<ol>
3375-
<li> <strong>Determine the used flex ratio.</strong> Sum the outer <a
3375+
<li> <strong>Determine the used flex factor.</strong> Sum the outer <a
33763376
href="#hypothetical-main-size"><i>hypothetical main sizes</i></a> of all
33773377
items on the line. If the sum is less than the flex container's inner
33783378
main size, use the <a href="#flex-grow-factor"><i>flex grow
33793379
factor</i></a> for the rest of this algorithm; otherwise, use the <a
33803380
href="#flex-shrink-factor"><i>flex shrink factor</i></a>.
33813381

33823382
<li> <strong>Size inflexible items.</strong> For any items that have a
3383-
flex ratio of zero, set their used main size to their <a
3383+
flex factor of zero, set their used main size to their <a
33843384
href="#hypothetical-main-size"><i>hypothetical main size</i></a>.
33853385

33863386
<li> <strong>Check that you can distribute any space.</strong> If all the
3387-
flex items on the line are either frozen or have a flex ratio of zero,
3387+
flex items on the line are either frozen or have a flex factor of zero,
33883388
exit the algorithm.
33893389

33903390
<li> <strong>Calculate free space.</strong> Sum the outer <a
@@ -3393,12 +3393,12 @@ <h3 id=resolve-flexible-lengths><span class=secno>9.7. </span> Resolving
33933393
is the free space.
33943394

33953395
<li> <strong>Distribute free space proportional to the flex
3396-
ratios.</strong> If the sign of the free space is positive and the
3396+
factors.</strong> If the sign of the free space is positive and the
33973397
algorithm is using the <a href="#flex-grow-factor"><i>flex grow
33983398
factor</i></a>, or if the sign of the free space is negative and the
33993399
algorithm is using the <a href="#flex-shrink-factor"><i>flex shrink
34003400
factor</i></a>, distribute the free space to each flexible item's main
3401-
size in proportion to the item's flex ratio:
3401+
size in proportion to the item's flex factor:
34023402
<dl>
34033403
<dt>If the free space is positive
34043404

@@ -3414,11 +3414,12 @@ <h3 id=resolve-flexible-lengths><span class=secno>9.7. </span> Resolving
34143414
<dd> For every item on the line, multiply its <a
34153415
href="#flex-shrink-factor"><i>flex shrink factor</i></a> by its outer
34163416
<a href="#flex-base-size"><i>flex base size</i></a>, and note this as
3417-
its <dfn id=flex-shrink-ratio>flex shrink ratio</dfn>. Find the ratio
3418-
of the item's <a href="#flex-shrink-ratio"><i>flex shrink ratio</i></a>
3419-
to the sum of the <a href="#flex-shrink-ratio"><i>flex shrink
3420-
ratios</i></a> of all items on the line. Set the item's main size to
3421-
its <a href="#flex-base-size"><i>flex base size</i></a> minus a
3417+
its <dfn id=scaled-flex-shrink-factor>scaled flex shrink factor</dfn>.
3418+
Find the ratio of the item's <a
3419+
href="#scaled-flex-shrink-factor"><i>scaled flex shrink factor</i></a>
3420+
to the sum of the <a href="#scaled-flex-shrink-factor"><i>scaled flex
3421+
shrink factors</i></a> of all items on the line. Set the item's main
3422+
size to its <a href="#flex-base-size"><i>flex base size</i></a> minus a
34223423
fraction of the absolute value of the free space proportional to the
34233424
ratio. <span class=note>Note this may result in a negative inner main
34243425
size; it will be corrected in the next step.</span>
@@ -4390,9 +4391,6 @@ <h2 class=no-num id=index>Index</h2>
43904391
<li>flex shrink factor, <a href="#flex-shrink-factor"
43914392
title="flex shrink factor"><strong>7.1.</strong></a>
43924393

4393-
<li>flex shrink ratio, <a href="#flex-shrink-ratio"
4394-
title="flex shrink ratio"><strong>9.7.</strong></a>
4395-
43964394
<li><a href="#align-content-flex-start"><code
43974395
class=css>flex-start</code></a>’, <a href="#align-content-flex-start"
43984396
title="''flex-start''"><strong>8.4.</strong></a>, <a
@@ -4473,6 +4471,9 @@ <h2 class=no-num id=index>Index</h2>
44734471
class=css>row-reverse</code></a>’, <a href="#flex-flow-row-reverse"
44744472
title="''row-reverse''"><strong>5.1.</strong></a>
44754473

4474+
<li>scaled flex shrink factor, <a href="#scaled-flex-shrink-factor"
4475+
title="scaled flex shrink factor"><strong>9.7.</strong></a>
4476+
44764477
<li>single-line, <a href="#single-line"
44774478
title=single-line><strong>6.</strong></a>
44784479

css3-flexbox/Overview.src.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ <h3 id='flex-property'>
15221522
sets the 'flex-basis' <a href="#flex-components">longhand</a>
15231523
and specifies the <dfn>flex basis</dfn>:
15241524
the initial <i>main size</i> of the <i>flex item</i>,
1525-
before free space is distributed according to the flex ratios.
1525+
before free space is distributed according to the flex factors.
15261526
When omitted from the 'flex' shorthand, its specified value is the length zero.
15271527
<p>
15281528
If the specified 'flex-basis' is <a href="#flex-basis-auto">''auto''</a>,
@@ -1535,7 +1535,7 @@ <h3 id='flex-property'>
15351535
(starting from a basis of zero)
15361536
and "relative" flex
15371537
(starting from a basis of the item's content size).
1538-
The three items have flex ratios of ''1'', ''1'', and ''2'', respectively.
1538+
The three items have flex factors of ''1'', ''1'', and ''2'', respectively.
15391539
</figcaption>
15401540
</figure>
15411541

@@ -1556,7 +1556,7 @@ <h3 id='flex-property'>
15561556
must be interpreted as a flex factor.
15571557
To avoid misinterpretation or invalid declarations,
15581558
authors must specify a zero <var>&lt;flex-basis></var> component
1559-
with a unit or precede it by both flex ratios.
1559+
with a unit or precede it by two flex factors.
15601560

15611561
<h3 id='flex-common'>
15621562
Common Values of 'flex'</h3>
@@ -1602,7 +1602,7 @@ <h3 id='flex-common'>
16021602
Makes the flex item flexible and sets the <i>flex basis</i> to zero,
16031603
resulting in an item that receives the specified proportion of the free space in the flex container.
16041604
If all items in the flex container use this pattern,
1605-
their sizes will be proportional to the specified flex ratio.
1605+
their sizes will be proportional to the specified flex factor.
16061606
</dl>
16071607

16081608
<p>
@@ -2670,22 +2670,22 @@ <h3 id='resolve-flexible-lengths'>
26702670

26712671
<ol>
26722672
<li>
2673-
<strong>Determine the used flex ratio.</strong>
2673+
<strong>Determine the used flex factor.</strong>
26742674
Sum the outer <i>hypothetical main sizes</i> of all items on the line.
26752675
If the sum is less than the flex container's inner main size,
26762676
use the <i>flex grow factor</i> for the rest of this algorithm;
26772677
otherwise, use the <i>flex shrink factor</i>.
26782678

26792679
<li>
26802680
<strong>Size inflexible items.</strong>
2681-
For any items that have a flex ratio of zero,
2681+
For any items that have a flex factor of zero,
26822682
set their used main size
26832683
to their <i>hypothetical main size</i>.
26842684

26852685
<li>
26862686
<strong>Check that you can distribute any space.</strong>
26872687
If all the flex items on the line are either frozen
2688-
or have a flex ratio of zero,
2688+
or have a flex factor of zero,
26892689
exit the algorithm.
26902690

26912691
<li>
@@ -2695,11 +2695,11 @@ <h3 id='resolve-flexible-lengths'>
26952695
This is the free space.
26962696

26972697
<li>
2698-
<strong>Distribute free space proportional to the flex ratios.</strong>
2698+
<strong>Distribute free space proportional to the flex factors.</strong>
26992699
If the sign of the free space is positive and the algorithm is using the <i>flex grow factor</i>,
27002700
or if the sign of the free space is negative and the algorithm is using the <i>flex shrink factor</i>,
27012701
distribute the free space to each flexible item's main size
2702-
in proportion to the item's flex ratio:
2702+
in proportion to the item's flex factor:
27032703

27042704
<dl>
27052705
<dt>If the free space is positive</dt>
@@ -2716,9 +2716,9 @@ <h3 id='resolve-flexible-lengths'>
27162716
For every item on the line,
27172717
multiply its <i>flex shrink factor</i>
27182718
by its outer <i>flex base size</i>,
2719-
and note this as its <dfn>flex shrink ratio</dfn>.
2720-
Find the ratio of the item's <i>flex shrink ratio</i>
2721-
to the sum of the <i>flex shrink ratios</i> of all items on the line.
2719+
and note this as its <dfn>scaled flex shrink factor</dfn>.
2720+
Find the ratio of the item's <i>scaled flex shrink factor</i>
2721+
to the sum of the <i>scaled flex shrink factors</i> of all items on the line.
27222722
Set the item's main size
27232723
to its <i>flex base size</i>
27242724
minus a fraction of the absolute value of the free space

0 commit comments

Comments
 (0)