Skip to content

Commit 6668473

Browse files
committed
[css-grid] Simplify description of normal sizing. w3c#5713 (comment)
1 parent 1351732 commit 6668473

2 files changed

Lines changed: 18 additions & 19 deletions

File tree

css-grid-1/Overview.bs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,22 +1116,22 @@ Grid Items</h2>
11161116

11171117
: ''align-self/normal''
11181118
::
1119-
If the grid item is a [=replaced element=] with a [=natural size=] in the relevant dimension
1120-
(or with a [=preferred aspect ratio=] and a size in the other dimension)
1121-
the grid item is sized as for ''align-self: start''
1122-
(consistent with the width calculation rules for block-level replaced elements in [[CSS2/visudet#block-replaced-width]]).
1119+
If the grid item has no [=preferred aspect ratio=],
1120+
and no [=natural size=] in the relevant axis (if it is a [=replaced element=]),
1121+
the grid item is sized as for ''align-self: stretch''.
11231122

11241123
Otherwise,
1125-
if the grid item has a [=preferred aspect ratio=],
1126-
the grid item is sized as for a [=block-level box=].
1124+
the grid item is sized
1125+
consistent with the size calculation rules for block-level elements
1126+
for the corresponding axis.
1127+
(See [[CSS2#q10.0]].)
11271128

1128-
Otherwise,
1129-
the grid item is sized as for ''align-self/stretch''.
11301129

11311130
: ''align-self/stretch''
11321131
::
11331132
Use the [=inline size=] calculation rules for non-replaced boxes
1134-
(defined in [[CSS2/visudet#blockwidth]]).
1133+
(defined in [[CSS2/visudet#blockwidth]]),
1134+
i.e. the [=stretch-fit size=].
11351135

11361136
Note: This can distort the aspect ratio
11371137
of an item with a [=preferred aspect ratio=],

css-grid-2/Overview.bs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,22 +1163,21 @@ Grid Items</h2>
11631163

11641164
: ''align-self/normal''
11651165
::
1166-
If the grid item is a [=replaced element=] with a [=natural size=] in the relevant dimension
1167-
(or with a [=preferred aspect ratio=] and a [=natural size=] in the other dimension)
1168-
the grid item is sized as for ''align-self: start''
1169-
(consistent with the width calculation rules for block-level replaced elements in [[CSS2/visudet#block-replaced-width]]).
1166+
If the grid item has no [=preferred aspect ratio=],
1167+
and no [=natural size=] in the relevant axis (if it is a [=replaced element=]),
1168+
the grid item is sized as for ''align-self: stretch''.
11701169

11711170
Otherwise,
1172-
if the grid item has a [=preferred aspect ratio=],
1173-
the grid item is sized as for a [=block-level box=].
1174-
1175-
Otherwise,
1176-
the grid item is sized as for ''align-self/stretch''.
1171+
the grid item is sized
1172+
consistent with the size calculation rules for block-level elements
1173+
for the corresponding axis.
1174+
(See [[CSS2#q10.0]].)
11771175

11781176
: ''align-self/stretch''
11791177
::
11801178
Use the [=inline size=] calculation rules for non-replaced boxes
1181-
(defined in [[CSS2/visudet#blockwidth]]).
1179+
(defined in [[CSS2/visudet#blockwidth]]),
1180+
i.e. the [=stretch-fit size=].
11821181

11831182
Note: This can distort the aspect ratio
11841183
of an item with a [=preferred aspect ratio=],

0 commit comments

Comments
 (0)