Skip to content

Commit 0c1a35d

Browse files
committed
[css-flexbox-1][css-grid-1][css-grid-2] Align terminology. #5663
1 parent 070c9e5 commit 0c1a35d

File tree

3 files changed

+28
-27
lines changed

3 files changed

+28
-27
lines changed

css-flexbox-1/Overview.bs

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -987,26 +987,27 @@ Automatic Minimum Size of Flex Items</h3>
987987
<dl>
988988
<dt><dfn>specified size suggestion</dfn>
989989
<dd>
990-
If the item’s computed <a>main size property</a> is <a>definite</a>,
990+
If the item’s [=preferred size|preferred=] [=main size=] is <a>definite</a>,
991991
then the <a>specified size suggestion</a> is that size
992-
(clamped by its <a>max main size property</a> if it's <a>definite</a>).
992+
(clamped by its [=maximum size|maximum=] [=main size=] if it's <a>definite</a>).
993993
It is otherwise undefined.
994994

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

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

10121013
For the purpose of calculating an intrinsic size of the box
@@ -2966,8 +2967,10 @@ Definite and Indefinite Sizes</h3>
29662967
<ol>
29672968
<li>
29682969
If a <a>single-line</a> <a>flex container</a> has a definite <a>cross size</a>,
2969-
the outer <a>cross size</a> of any <a>stretched</a> <a>flex items</a>
2970-
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>)
2970+
the [=automatic size|automatic=] [=preferred size|preferred=] [=outer size|outer=] [=cross size=]
2971+
of any <a>stretched</a> <a>flex items</a>
2972+
is the flex container's inner <a>cross size</a>
2973+
(clamped to the <a>flex item</a>’s min and max <a>cross size</a>)
29712974
and is considered <a>definite</a>.
29722975

29732976
<li>

css-grid-1/Overview.bs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,30 +1333,29 @@ Automatic Minimum Size of Grid Items</h3>
13331333
<dl>
13341334
<dt><dfn>specified size suggestion</dfn>
13351335
<dd>
1336-
If the item’s computed <a>preferred size property</a> in the relevant axis is <a>definite</a>,
1336+
If the item’s [=preferred size=] in the relevant axis is <a>definite</a>,
13371337
then the <a>specified size suggestion</a> is that size
1338-
(clamped by the relevant <a>max size property</a> if it's <a>definite</a>).
1338+
(clamped by the relevant [=maximum size=] if it's <a>definite</a>).
13391339
It is otherwise undefined.
13401340

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

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

13621361
For the purpose of calculating an intrinsic size of the box

css-grid-2/Overview.bs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1380,30 +1380,29 @@ Automatic Minimum Size of Grid Items</h3>
13801380
<dl>
13811381
<dt><dfn>specified size suggestion</dfn>
13821382
<dd>
1383-
If the item’s computed <a>preferred size property</a> in the relevant axis is <a>definite</a>,
1383+
If the item’s [=preferred size=] in the relevant axis is <a>definite</a>,
13841384
then the <a>specified size suggestion</a> is that size
1385-
(clamped by the relevant <a>max size property</a> if it's <a>definite</a>).
1385+
(clamped by the relevant [=maximum size=] if it's <a>definite</a>).
13861386
It is otherwise undefined.
13871387

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

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

14091408
For the purpose of calculating an intrinsic size of the box

0 commit comments

Comments
 (0)