Skip to content

Commit b68ba1a

Browse files
committed
[css-grid] Fix a few missed changes for the extension of auto track sizing.
1 parent a94ce7d commit b68ba1a

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

css-grid/Overview.bs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -833,8 +833,8 @@ Track Sizing: the 'grid-template-rows' and 'grid-template-columns' properties</h
833833

834834
<pre>
835835
<dfn>&lt;track-list></dfn> = [ <<line-names>>? [ <<track-size>> | <<repeat()>> ] ]+ <<line-names>>?
836-
<dfn>&lt;track-size></dfn> = minmax( <<track-breadth>> , <<track-breadth>> ) | auto | <<track-breadth>>
837-
<dfn>&lt;track-breadth></dfn> = <<length>> | <<percentage>> | <<flex>> | min-content | max-content
836+
<dfn>&lt;track-size></dfn> = minmax( <<track-breadth>> , <<track-breadth>> ) | <<track-breadth>>
837+
<dfn>&lt;track-breadth></dfn> = <<length>> | <<percentage>> | <<flex>> | min-content | max-content | auto
838838
<dfn>&lt;line-names></dfn> = ( <<custom-ident>>* )
839839
<dfn>&lt;line-name-list></dfn> = [ <<line-names>> | repeat([ <<positive-integer>> | auto ], <<line-names>>+) ]+
840840
</pre>
@@ -853,9 +853,7 @@ Track Sizing: the 'grid-template-rows' and 'grid-template-columns' properties</h
853853
and the <a>block size</a> of the <a>grid container</a> in row <a>grid tracks</a>.
854854
If the <a title="inline size">inline</a> or <a>block size</a> of the <a>grid container</a>
855855
is <a>indefinite</a>,
856-
<<percentage>> values relative to that size are treated as <a value for=width>auto</a>
857-
(or, if in a ''minmax()'' function, as ''min-content'' when in the first position
858-
and as ''max-content'' when in the second).
856+
<<percentage>> values relative to that size are treated as <a value for=width>auto</a>.
859857

860858
<dt><dfn><<flex>></dfn>
861859
<dd>

css-grid/Overview.html

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1986,8 +1986,8 @@ <h3 class="heading settled" data-level="5.1" id="track-sizing"><span class="secn
19861986

19871987

19881988
<pre><dfn data-dfn-type="type" data-export="" id="typedef-track-list">&lt;track-list><a class="self-link" href="#typedef-track-list"></a></dfn> = [ <a class="production" data-link-type="type" href="#typedef-line-names">&lt;line-names></a>? [ <a class="production" data-link-type="type" href="#typedef-track-size">&lt;track-size></a> | <a class="production" data-link-type="function" href="#funcdef-repeat" title="repeat()">&lt;repeat()></a> ] ]+ <a class="production" data-link-type="type" href="#typedef-line-names">&lt;line-names></a>?
1989-
<dfn data-dfn-type="type" data-export="" id="typedef-track-size">&lt;track-size><a class="self-link" href="#typedef-track-size"></a></dfn> = minmax( <a class="production" data-link-type="type" href="#typedef-track-breadth">&lt;track-breadth></a> , <a class="production" data-link-type="type" href="#typedef-track-breadth">&lt;track-breadth></a> ) | auto | <a class="production" data-link-type="type" href="#typedef-track-breadth">&lt;track-breadth></a>
1990-
<dfn data-dfn-type="type" data-export="" id="typedef-track-breadth">&lt;track-breadth><a class="self-link" href="#typedef-track-breadth"></a></dfn> = <a class="production" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#length-value">&lt;length></a> | <a class="production" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#percentage-value">&lt;percentage></a> | <a class="production" data-link-type="type" href="#typedef-flex">&lt;flex></a> | min-content | max-content
1989+
<dfn data-dfn-type="type" data-export="" id="typedef-track-size">&lt;track-size><a class="self-link" href="#typedef-track-size"></a></dfn> = minmax( <a class="production" data-link-type="type" href="#typedef-track-breadth">&lt;track-breadth></a> , <a class="production" data-link-type="type" href="#typedef-track-breadth">&lt;track-breadth></a> ) | <a class="production" data-link-type="type" href="#typedef-track-breadth">&lt;track-breadth></a>
1990+
<dfn data-dfn-type="type" data-export="" id="typedef-track-breadth">&lt;track-breadth><a class="self-link" href="#typedef-track-breadth"></a></dfn> = <a class="production" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#length-value">&lt;length></a> | <a class="production" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#percentage-value">&lt;percentage></a> | <a class="production" data-link-type="type" href="#typedef-flex">&lt;flex></a> | min-content | max-content | auto
19911991
<dfn data-dfn-type="type" data-export="" id="typedef-line-names">&lt;line-names><a class="self-link" href="#typedef-line-names"></a></dfn> = ( <a class="production" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#identifier-value">&lt;custom-ident></a>* )
19921992
<dfn data-dfn-type="type" data-export="" id="typedef-line-name-list">&lt;line-name-list><a class="self-link" href="#typedef-line-name-list"></a></dfn> = [ <a class="production" data-link-type="type" href="#typedef-line-names">&lt;line-names></a> | repeat([ <a class="production" data-link-type="type">&lt;positive-integer></a> | auto ], <a class="production" data-link-type="type" href="#typedef-line-names">&lt;line-names></a>+) ]+
19931993
</pre>
@@ -2012,9 +2012,7 @@ <h3 class="heading settled" data-level="5.1" id="track-sizing"><span class="secn
20122012
and the <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-writing-modes-3/#block-size">block size</a> of the <a data-link-type="dfn" href="#grid-container">grid container</a> in row <a data-link-type="dfn" href="#grid-track">grid tracks</a>.
20132013
If the <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-writing-modes-3/#inline-size" title="inline size">inline</a> or <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-writing-modes-3/#block-size">block size</a> of the <a data-link-type="dfn" href="#grid-container">grid container</a>
20142014
is <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-sizing-3/#indefinite">indefinite</a>,
2015-
<a class="production css" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#percentage-value">&lt;percentage></a> values relative to that size are treated as <a class="css" data-link-for="width" data-link-type="value">auto</a>
2016-
(or, if in a <a class="css" data-link-type="maybe" href="#valdef-grid-template-columns-grid-template-rows-minmax">minmax()</a> function, as <a class="css" data-link-type="maybe" href="#valdef-grid-template-columns-grid-template-rows-min-content">min-content</a> when in the first position
2017-
and as <a class="css" data-link-type="maybe" href="#valdef-grid-template-columns-grid-template-rows-max-content">max-content</a> when in the second).
2015+
<a class="production css" data-link-type="type" href="http://dev.w3.org/csswg/css-values-3/#percentage-value">&lt;percentage></a> values relative to that size are treated as <a class="css" data-link-for="width" data-link-type="value">auto</a>.
20182016

20192017
</dd>
20202018
<dt><dfn class="css" data-dfn-for="grid-template-columns grid-template-rows" data-dfn-type="value" data-export="" id="valdef-grid-template-columns-grid-template-rows-flex"><a class="production css" data-link-type="type" href="#typedef-flex">&lt;flex></a><a class="self-link" href="#valdef-grid-template-columns-grid-template-rows-flex"></a></dfn>

0 commit comments

Comments
 (0)