Skip to content

Commit 6ad605f

Browse files
committed
[css-grid] Allow repeat() when specifying a subgrid.
1 parent 9d33086 commit 6ad605f

2 files changed

Lines changed: 15 additions & 18 deletions

File tree

css-grid/Overview.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ <h2 data-level=5 id=grid-definition><span class=secno>5 </span><span class=conte
831831
<h3 data-level=5.1 id=track-sizing><span class=secno>5.1 </span><span class=content>
832832
Track Sizing: the <a class=property data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>grid-template-rows</a> and <a class=property data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>grid-template-columns</a> properties</span><a class=section-link href=#track-sizing>§</a></h3>
833833

834-
<table class=propdef><tr><th>Name:<td><dfn data-dfn-type=property data-export="" id=propdef-grid-template-columns>grid-template-columns</dfn>, <dfn data-dfn-type=property data-export="" id=propdef-grid-template-rows>grid-template-rows</dfn><tr><th>Value:<td>none | <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> | subgrid <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>*<tr><th>Initial:<td>none<tr><th>Applies to:<td><a href=#grid-container>grid containers</a><tr><th>Inherited:<td>no<tr><th>Percentages:<td>n/a<tr><th>Media:<td>visual<tr><th>Computed value:<td>As specified, except for <a data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto>auto</a> (see prose)</table>
834+
<table class=propdef><tr><th>Name:<td><dfn data-dfn-type=property data-export="" id=propdef-grid-template-columns>grid-template-columns</dfn>, <dfn data-dfn-type=property data-export="" id=propdef-grid-template-rows>grid-template-rows</dfn><tr><th>Value:<td>none | <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> | subgrid <a class=production data-link-type=type href=#typedef-line-name-list>&lt;line-name-list&gt;</a>?<tr><th>Initial:<td>none<tr><th>Applies to:<td><a href=#grid-container>grid containers</a><tr><th>Inherited:<td>no<tr><th>Percentages:<td>n/a<tr><th>Media:<td>visual<tr><th>Computed value:<td>As specified, except for <a data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto>auto</a> (see prose)</table>
835835
<p>
836836
These properties specify,
837837
as a space-separated <dfn data-dfn-type=dfn data-export="" id=track-list>track list</dfn>,
@@ -848,10 +848,11 @@ <h3 data-level=5.1 id=track-sizing><span class=secno>5.1 </span><span class=cont
848848
while <a class=property data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>grid-template-rows</a> specifies the <a href=#track-list>track list</a> for the grid's rows.
849849
The syntax of a <a href=#track-list>track list</a> is:
850850

851-
<pre> <dfn data-dfn-type=type data-export="" id=typedef-track-list>&lt;track-list&gt;</dfn> = [ <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>? [ <a class=production data-link-type=type href=#typedef-track-size>&lt;track-size&gt;</a> | <a class=production data-link-type=function href=#funcdef-repeat title=repeat()>&lt;repeat()&gt;</a> ] ]+ <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>?
852-
<dfn data-dfn-type=type data-export="" id=typedef-track-size>&lt;track-size&gt;</dfn> = minmax( <a class=production data-link-type=type href=#typedef-track-breadth>&lt;track-breadth&gt;</a> , <a class=production data-link-type=type href=#typedef-track-breadth>&lt;track-breadth&gt;</a> ) | auto | <a class=production data-link-type=type href=#typedef-track-breadth>&lt;track-breadth&gt;</a>
853-
<dfn data-dfn-type=type data-export="" id=typedef-track-breadth>&lt;track-breadth&gt;</dfn> = <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#length-value>&lt;length&gt;</a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#percentage-value>&lt;percentage&gt;</a> | <a class=production data-link-type=type href=#typedef-flex>&lt;flex&gt;</a> | min-content | max-content
854-
<dfn data-dfn-type=type data-export="" id=typedef-line-names>&lt;line-names&gt;</dfn> = ( <a class=production data-link-type=type>&lt;ident&gt;</a>* )
851+
<pre> <dfn data-dfn-type=type data-export="" id=typedef-track-list>&lt;track-list&gt;</dfn> = [ <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>? [ <a class=production data-link-type=type href=#typedef-track-size>&lt;track-size&gt;</a> | <a class=production data-link-type=function href=#funcdef-repeat title=repeat()>&lt;repeat()&gt;</a> ] ]+ <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>?
852+
<dfn data-dfn-type=type data-export="" id=typedef-track-size>&lt;track-size&gt;</dfn> = minmax( <a class=production data-link-type=type href=#typedef-track-breadth>&lt;track-breadth&gt;</a> , <a class=production data-link-type=type href=#typedef-track-breadth>&lt;track-breadth&gt;</a> ) | auto | <a class=production data-link-type=type href=#typedef-track-breadth>&lt;track-breadth&gt;</a>
853+
<dfn data-dfn-type=type data-export="" id=typedef-track-breadth>&lt;track-breadth&gt;</dfn> = <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#length-value>&lt;length&gt;</a> | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#percentage-value>&lt;percentage&gt;</a> | <a class=production data-link-type=type href=#typedef-flex>&lt;flex&gt;</a> | min-content | max-content
854+
<dfn data-dfn-type=type data-export="" id=typedef-line-names>&lt;line-names&gt;</dfn> = ( <a class=production data-link-type=type>&lt;ident&gt;</a>* )
855+
<dfn data-dfn-type=type data-export="" id=typedef-line-name-list>&lt;line-name-list&gt;</dfn> = [ <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a> || repeat(<a class=production data-link-type=type>&lt;positive-integer&gt;</a>, <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>) ]+
855856
</pre>
856857
<p>Where:
857858

@@ -1148,9 +1149,6 @@ <h4 data-level=5.1.4 id=subgrids><span class=secno>5.1.4 </span><span class=cont
11481149
grid-column: 2;
11491150
}</pre> </div>
11501151

1151-
<p class=issue>
1152-
Do we want to allow <a class=css data-link-type=maybe href=#funcdef-repeat>repeat()</a> when specifying named lines for subgrids?
1153-
11541152
<h4 data-level=5.1.5 id=resolved-track-list><span class=secno>5.1.5 </span><span class=content>
11551153
Resolved Values</span><a class=section-link href=#resolved-track-list>§</a></h4>
11561154

@@ -2759,6 +2757,7 @@ <h2 class="no-num no-ref" id=index><span class=content>
27592757
<li>inline-grid (value), <a href=#valuedef-inline-grid title="section 3.1">3.1</a>
27602758
<li>&lt;integer&gt; &amp;&amp; &lt;ident&gt;? (value), <a href=#grid-placement-int title="section 7.1">7.1</a>
27612759
<li>&lt;length&gt; (value), <a href=#valuedef-length title="section 5.1">5.1</a>
2760+
<li>&lt;line-name-list&gt;, <a href=#typedef-line-name-list title="section 5.1">5.1</a>
27622761
<li>&lt;line-names&gt;, <a href=#typedef-line-names title="section 5.1">5.1</a>
27632762
<li>max-content (value), <a href=#valuedef-max-content title="section 5.1">5.1</a>
27642763
<li>MaxTrackSizingFunction, <a href=#MaxTrackSizingFunction-definition title="section 10.1">10.1</a>
@@ -2797,8 +2796,8 @@ <h2 class="no-num no-ref" id=property-index><span class=content>
27972796
Property index</span><a class=section-link href=#property-index>§</a></h2>
27982797
<div data-fill-with=property-index><table class=proptable><thead><tr><th scope=col>Name<th scope=col>Value<th scope=col>Initial<th scope=col>Applies To<th scope=col>Inh.<th scope=col>%ages<th scope=col>Media<th scope=col>Applies to<th scope=col>Computed value<th scope=col>New Values<tbody>
27992798
<tr><th scope=row><a data-property="">display</a><td><td><td><td><td><td><td><td><td>grid | inline-grid
2800-
<tr><th scope=row><a data-property="">grid-template-columns</a><td>none | <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> | subgrid <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>*<td>none<td><td>no<td>n/a<td>visual<td><a href=#grid-container>grid containers</a><td>As specified, except for <a data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto>auto</a> (see prose)<td>
2801-
<tr><th scope=row><a data-property="">grid-template-rows</a><td>none | <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> | subgrid <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>*<td>none<td><td>no<td>n/a<td>visual<td><a href=#grid-container>grid containers</a><td>As specified, except for <a data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto>auto</a> (see prose)<td>
2799+
<tr><th scope=row><a data-property="">grid-template-columns</a><td>none | <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> | subgrid <a class=production data-link-type=type href=#typedef-line-name-list>&lt;line-name-list&gt;</a>?<td>none<td><td>no<td>n/a<td>visual<td><a href=#grid-container>grid containers</a><td>As specified, except for <a data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto>auto</a> (see prose)<td>
2800+
<tr><th scope=row><a data-property="">grid-template-rows</a><td>none | <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> | subgrid <a class=production data-link-type=type href=#typedef-line-name-list>&lt;line-name-list&gt;</a>?<td>none<td><td>no<td>n/a<td>visual<td><a href=#grid-container>grid containers</a><td>As specified, except for <a data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto>auto</a> (see prose)<td>
28022801
<tr><th scope=row><a data-property="">grid-template-areas</a><td>none | <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value>&lt;string&gt;</a>+<td>none<td><td>no<td>n/a<td>visual<td><a href=#grid-container>grid containers</a><td>specified value<td>
28032802
<tr><th scope=row><a data-property="">grid-template</a><td>none | <a class=production data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>&lt;‘grid-template-columns’&gt;</a> / <a class=production data-link-type=propdesc href=#propdef-grid-template-rows title=grid-template-rows>&lt;‘grid-template-rows’&gt;</a> |<br> [ <a class=production data-link-type=type href=#typedef-track-list>&lt;track-list&gt;</a> / ]? [ <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a>? <a class=production data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value>&lt;string&gt;</a> [ <a class=production data-link-type=type href=#typedef-track-size>&lt;track-size&gt;</a> <a class=production data-link-type=type href=#typedef-line-names>&lt;line-names&gt;</a> ]? ]+<td>see individual properties<td><td>see individual properties<td>see individual properties<td>visual<td><a href=#grid-container>grid containers</a><td>see individual properties<td>
28042803
<tr><th scope=row><a data-property="">grid-auto-columns</a><td><a class=production data-link-type=type href=#typedef-track-size>&lt;track-size&gt;</a><td>auto<td><td>no<td>see <a href=#track-sizing>Track Sizing</a><td>visual<td><a href=#grid-container>grid containers</a><td>see <a href=#track-sizing>Track Sizing</a><td>

css-grid/Overview.src.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ <h3 id='track-sizing'>
747747

748748
<pre class='propdef'>
749749
Name: grid-template-columns, grid-template-rows
750-
Value: none | <<track-list>> | subgrid <<line-names>>*
750+
Value: none | <<track-list>> | subgrid <<line-name-list>>?
751751
Initial: none
752752
Applies to: <a>grid containers</a>
753753
Inherited: no
@@ -773,10 +773,11 @@ <h3 id='track-sizing'>
773773
The syntax of a <a>track list</a> is:
774774

775775
<pre>
776-
<dfn>&lt;track-list></dfn> = [ <<line-names>>? [ <<track-size>> | <<repeat()>> ] ]+ <<line-names>>?
777-
<dfn>&lt;track-size></dfn> = minmax( <<track-breadth>> , <<track-breadth>> ) | auto | <<track-breadth>>
778-
<dfn>&lt;track-breadth></dfn> = <<length>> | <<percentage>> | <<flex>> | min-content | max-content
779-
<dfn>&lt;line-names></dfn> = ( <<ident>>* )
776+
<dfn>&lt;track-list></dfn> = [ <<line-names>>? [ <<track-size>> | <<repeat()>> ] ]+ <<line-names>>?
777+
<dfn>&lt;track-size></dfn> = minmax( <<track-breadth>> , <<track-breadth>> ) | auto | <<track-breadth>>
778+
<dfn>&lt;track-breadth></dfn> = <<length>> | <<percentage>> | <<flex>> | min-content | max-content
779+
<dfn>&lt;line-names></dfn> = ( <<ident>>* )
780+
<dfn>&lt;line-name-list></dfn> = [ <<line-names>> || repeat(<<positive-integer>>, <<line-names>>) ]+
780781
</pre>
781782

782783
<p>Where:
@@ -1085,9 +1086,6 @@ <h4 id="subgrids">
10851086
}</pre>
10861087
</div>
10871088

1088-
<p class='issue'>
1089-
Do we want to allow ''repeat()'' when specifying named lines for subgrids?
1090-
10911089
<h4 id='resolved-track-list'>
10921090
Resolved Values</h4>
10931091

0 commit comments

Comments
 (0)