Skip to content

Commit c184924

Browse files
committed
[css-grid] Restore content-alignment condition for stretching auto tracks. w3c#5966
1 parent 74eb55d commit c184924

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

css-grid-1/Overview.bs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4513,7 +4513,9 @@ Find the Size of an ''fr''</h4>
45134513
<h3 id="algo-stretch">
45144514
Stretch <css>auto</css> Tracks</h3>
45154515

4516-
This step expands tracks that have
4516+
When the [=content-distribution property=] of the [=grid container=]
4517+
is ''justify-content/normal'' or ''justify-content/stretch'' in this axis,
4518+
this step expands tracks that have
45174519
an ''grid-template-columns/auto'' <a>max track sizing function</a>
45184520
by dividing any remaining positive, <a>definite</a> <a>free space</a>
45194521
equally amongst them.
@@ -4701,6 +4703,13 @@ Changes since the <a href="https://www.w3.org/TR/2020/CRD-css-grid-1-20201218/">
47014703
Made [[#auto-margins]] normative and tightened up wording,
47024704
since some aspects of this behavior were not otherwise defined elsewhere.
47034705
(part of <a href="https://github.com/w3c/csswg-drafts/issues/5923">Issue 5923</a>)
4706+
<li id="change-2020-content-distribution-stretch">
4707+
Condition [[#algo-stretch]] on the relevant [=content-distribution property=]
4708+
behaving as ''justify-content/stretch'';
4709+
this condition was lost in translation during the
4710+
<a href="#change-2016-stretch-algo">earlier change</a>
4711+
to better incorporate ''justify-content/stretch'' handling into the algorithm.
4712+
(<a href="https://github.com/w3c/csswg-drafts/issues/5966">Issue 5966</a>)
47044713
</ul>
47054714

47064715
<h3 id="changes-202008">

css-grid-2/Overview.bs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5184,7 +5184,9 @@ Find the Size of an ''fr''</h4>
51845184
<h3 id="algo-stretch">
51855185
Stretch <css>auto</css> Tracks</h3>
51865186

5187-
This step expands tracks that have
5187+
When the [=content-distribution property=] of the [=grid container=]
5188+
is ''justify-content/normal'' or ''justify-content/stretch'' in this axis,
5189+
this step expands tracks that have
51885190
an ''grid-template-columns/auto'' <a>max track sizing function</a>
51895191
by dividing any remaining positive, <a>definite</a> <a>free space</a>
51905192
equally amongst them.
@@ -5337,6 +5339,13 @@ Changes since the <a href="https://www.w3.org/TR/2020/CRD-css-grid-2-20201218/">
53375339
Made [[#auto-margins]] normative and tightened up wording,
53385340
since some aspects of this behavior were not otherwise defined elsewhere.
53395341
(part of <a href="https://github.com/w3c/csswg-drafts/issues/5923">Issue 5923</a>)
5342+
<li id="change-2020-content-distribution-stretch">
5343+
Condition [[#algo-stretch]] on the relevant [=content-distribution property=]
5344+
behaving as ''justify-content/stretch'';
5345+
this condition was lost in translation during the
5346+
<a href="#change-2016-stretch-algo">earlier change</a>
5347+
to better incorporate ''justify-content/stretch'' handling into the algorithm.
5348+
(<a href="https://github.com/w3c/csswg-drafts/issues/5966">Issue 5966</a>)
53405349
</ul>
53415350

53425351
<h3 id="changes-202008">

0 commit comments

Comments
 (0)