Skip to content

Commit

Permalink
[css-flexbox-1][css-grid-1][css-grid-2] Align terminology. #5663
Browse files Browse the repository at this point in the history
  • Loading branch information
tabatkins committed Nov 4, 2020
1 parent 070c9e5 commit 0c1a35d
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 27 deletions.
21 changes: 12 additions & 9 deletions css-flexbox-1/Overview.bs
Original file line number Diff line number Diff line change
Expand Up @@ -987,26 +987,27 @@ Automatic Minimum Size of Flex Items</h3>
<dl>
<dt><dfn>specified size suggestion</dfn>
<dd>
If the item’s computed <a>main size property</a> is <a>definite</a>,
If the item’s [=preferred size|preferred=] [=main size=] is <a>definite</a>,
then the <a>specified size suggestion</a> is that size
(clamped by its <a>max main size property</a> if it's <a>definite</a>).
(clamped by its [=maximum size|maximum=] [=main size=] if it's <a>definite</a>).
It is otherwise undefined.

<dt><dfn>transferred size suggestion</dfn>
<dd>
If the item has a [=preferred aspect ratio=]
and its computed <a>cross size property</a> is <a>definite</a>,
and its [=preferred size|preferred=] [=cross size=] is <a>definite</a>,
then the <a>transferred size suggestion</a> is that size
(clamped by its <a lt="min cross size property">min and max cross size properties</a> if they are <a>definite</a>),
converted through the aspect ratio.
(clamped by its [=minimum size|minimum=] and [=maximum size|maximum=] [=cross sizes=] if they are <a>definite</a>),
converted through the aspect ratio,
and finally clamped by the same-axis [=maximum size=] if that is [=definite=].
It is otherwise undefined.

<dt><dfn>content size suggestion</dfn>
<dd>
The <a>content size suggestion</a> is the <a>min-content size</a> in the <a>main axis</a>,
clamped, if it has a [=preferred aspect ratio=],
by any <a>definite</a> <a lt="min cross size property">min and max cross size properties</a> converted through the aspect ratio,
and then further clamped by the <a>max main size property</a> if that is <a>definite</a>.
by any <a>definite</a> [=minimum size|minimum=] and [=maximum size|maximum=] [=cross sizes=] converted through the aspect ratio,
and finally clamped by the [=maximum size|maximum=] [=main size=] if that is <a>definite</a>.
</dl>

For the purpose of calculating an intrinsic size of the box
Expand Down Expand Up @@ -2966,8 +2967,10 @@ Definite and Indefinite Sizes</h3>
<ol>
<li>
If a <a>single-line</a> <a>flex container</a> has a definite <a>cross size</a>,
the outer <a>cross size</a> of any <a>stretched</a> <a>flex items</a>
is the flex container's inner <a>cross size</a> (clamped to the <a>flex item</a>’s min and max <a>cross size</a>)
the [=automatic size|automatic=] [=preferred size|preferred=] [=outer size|outer=] [=cross size=]
of any <a>stretched</a> <a>flex items</a>
is the flex container's inner <a>cross size</a>
(clamped to the <a>flex item</a>’s min and max <a>cross size</a>)
and is considered <a>definite</a>.

<li>
Expand Down
17 changes: 8 additions & 9 deletions css-grid-1/Overview.bs
Original file line number Diff line number Diff line change
Expand Up @@ -1333,30 +1333,29 @@ Automatic Minimum Size of Grid Items</h3>
<dl>
<dt><dfn>specified size suggestion</dfn>
<dd>
If the item’s computed <a>preferred size property</a> in the relevant axis is <a>definite</a>,
If the item’s [=preferred size=] in the relevant axis is <a>definite</a>,
then the <a>specified size suggestion</a> is that size
(clamped by the relevant <a>max size property</a> if it's <a>definite</a>).
(clamped by the relevant [=maximum size=] if it's <a>definite</a>).
It is otherwise undefined.

<dt><dfn>transferred size suggestion</dfn>
<dd>
If the item has a [=preferred aspect ratio=]
and its computed <a>preferred size property</a> in the opposite axis is <a>definite</a>,
and its [=preferred size=] in the opposite axis is <a>definite</a>,
then the <a>transferred size suggestion</a> is that size
(clamped by the opposite-axis <a lt="min size property">min and max size properties</a> if they are <a>definite</a>),
converted through the aspect ratio
and finally clamped by the same-axis <a>max size property</a> if it's definite.
(clamped by the opposite-axis [=minimum size|minimum=] and [=maximum sizes=] if they are <a>definite</a>),
converted through the aspect ratio,
and finally clamped by the same-axis [=maximum size=] if that is [=definite=].
It is otherwise undefined.

<dt><dfn>content size suggestion</dfn>
<dd>
The <a>content size suggestion</a> is
the <a>min-content size</a> in the relevant axis,
clamped, if it has a [=preferred aspect ratio=],
by any <a>definite</a> opposite-axis <a lt="min size property">min and max size properties</a>
by any <a>definite</a> opposite-axis [=minimum size|minimum=] and [=maximum sizes=]
converted through the aspect ratio,
and then further clamped by the same-axis <a>max size property</a>
if that is <a>definite</a>.
and finally clamped by the same-axis [=maximum size=] if that is <a>definite</a>.
</dl>

For the purpose of calculating an intrinsic size of the box
Expand Down
17 changes: 8 additions & 9 deletions css-grid-2/Overview.bs
Original file line number Diff line number Diff line change
Expand Up @@ -1380,30 +1380,29 @@ Automatic Minimum Size of Grid Items</h3>
<dl>
<dt><dfn>specified size suggestion</dfn>
<dd>
If the item’s computed <a>preferred size property</a> in the relevant axis is <a>definite</a>,
If the item’s [=preferred size=] in the relevant axis is <a>definite</a>,
then the <a>specified size suggestion</a> is that size
(clamped by the relevant <a>max size property</a> if it's <a>definite</a>).
(clamped by the relevant [=maximum size=] if it's <a>definite</a>).
It is otherwise undefined.

<dt><dfn>transferred size suggestion</dfn>
<dd>
If the item has a [=preferred aspect ratio=]
and its computed <a>preferred size property</a> in the opposite axis is <a>definite</a>,
and its [=preferred size=] in the opposite axis is <a>definite</a>,
then the <a>transferred size suggestion</a> is that size
(clamped by the opposite-axis <a lt="min size property">min and max size properties</a> if they are <a>definite</a>),
converted through the aspect ratio
and finally clamped by the same-axis <a>max size property</a> if it's definite.
(clamped by the opposite-axis [=minimum size|minimum=] and [=maximum sizes=] if they are <a>definite</a>),
converted through the aspect ratio,
and finally clamped by the same-axis [=maximum size=] if that is [=definite=].
It is otherwise undefined.

<dt><dfn>content size suggestion</dfn>
<dd>
The <a>content size suggestion</a> is
the <a>min-content size</a> in the relevant axis,
clamped, if it has a [=preferred aspect ratio=],
by any <a>definite</a> opposite-axis <a lt="min size property">min and max size properties</a>
by any <a>definite</a> opposite-axis [=minimum size|minimum=] and [=maximum sizes=]
converted through the aspect ratio,
and then further clamped by the same-axis <a>max size property</a>
if that is <a>definite</a>.
and finally clamped by the same-axis [=maximum size=] if that is <a>definite</a>.
</dl>

For the purpose of calculating an intrinsic size of the box
Expand Down

0 comments on commit 0c1a35d

Please sign in to comment.