Skip to content

Commit b932c38

Browse files
committed
[css-grid] Switch the complex grid-template syntax to use <track-list> rather than <'grid-template-columns'>, so it doesn't accidentally inherit subgrid ability.
1 parent 50024d7 commit b932c38

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

css-grid/Overview.html

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,9 +1789,8 @@ <h3 id=grid-template-property><span class=secno>5.3. </span> The ‘<a
17891789
<td>none | <var>&lt;‘<a href="#grid-template-columns"><code
17901790
class=property>grid-template-columns</code></a>></var> /
17911791
<var>&lt;‘<a href="#grid-template-rows"><code
1792-
class=property>grid-template-rows</code></a>></var> | [
1793-
<var>&lt;‘<a href="#grid-template-columns"><code
1794-
class=property>grid-template-columns</code></a>></var> / ]? [ <a
1792+
class=property>grid-template-rows</code></a>></var> | [ <a
1793+
href="#lttrack-list"><var>&lt;track-list></var></a> / ]? [ <a
17951794
href="#ltline-names"><var>&lt;line-names></var></a>?
17961795
<var>&lt;string></var> [ <a
17971796
href="#lttrack-size"><var>&lt;track-size></var></a> <a
@@ -1866,8 +1865,8 @@ <h3 id=grid-template-property><span class=secno>5.3. </span> The ‘<a
18661865
grid-template-areas: none;</pre>
18671866
</div>
18681867

1869-
<dt><dfn id=ltgrid-template-columns-ltline-names-lts>[ <var>&lt;‘<code
1870-
class=property>grid-template-columns</code>></var> / ]?<br>
1868+
<dt><dfn id=lttrack-list-ltline-names-ltstring-lttra>[
1869+
<var>&lt;track-list></var> / ]?<br>
18711870
[ <var>&lt;line-names></var>? <var>&lt;string></var> [
18721871
<var>&lt;track-size></var> <var>&lt;line-names></var> ]? ]+</dfn>
18731872

@@ -4027,13 +4026,6 @@ <h2 class=no-num id=index> Index</h2>
40274026
href="#ltgrid-template-columns-ltgrid-template-"
40284027
title="section 5.3."><strong>5.3.</strong></a>
40294028

4030-
<li>[ <var>&lt;‘<code
4031-
class=property>grid-template-columns</code>></var> / ]? [
4032-
<var>&lt;line-names></var>? <var>&lt;string></var> [
4033-
<var>&lt;track-size></var> <var>&lt;line-names></var> ]? ]+, <a
4034-
href="#ltgrid-template-columns-ltline-names-lts"
4035-
title="section 5.3."><strong>5.3.</strong></a>
4036-
40374029
<li>grid-template-rows, <a href="#grid-template-rows"
40384030
title="section 5.1."><strong>5.1.</strong></a>
40394031

@@ -4150,6 +4142,12 @@ <h2 class=no-num id=index> Index</h2>
41504142
<li>track list, <a href="#track-list"
41514143
title="section 5.1."><strong>5.1.</strong></a>
41524144

4145+
<li>[ <var>&lt;track-list></var> / ]? [ <var>&lt;line-names></var>?
4146+
<var>&lt;string></var> [ <var>&lt;track-size></var>
4147+
<var>&lt;line-names></var> ]? ]+, <a
4148+
href="#lttrack-list-ltline-names-ltstring-lttra"
4149+
title="section 5.3."><strong>5.3.</strong></a>
4150+
41534151
<li>&lt;track-size>, <a href="#lttrack-size"
41544152
title="section 5.1."><strong>5.1.</strong></a>
41554153
</ul>
@@ -4330,8 +4328,8 @@ <h2 class=no-num id=property-index> Property index</h2>
43304328
<th><a class=property href="#grid-template">grid-template</a>
43314329

43324330
<td>none | &lt;‘grid-template-columns’> /
4333-
&lt;‘grid-template-rows’> | [ &lt;‘grid-template-columns’> / ]?
4334-
[ &lt;line-names>? &lt;string> [ &lt;track-size> &lt;line-names> ]? ]+
4331+
&lt;‘grid-template-rows’> | [ &lt;track-list> / ]? [
4332+
&lt;line-names>? &lt;string> [ &lt;track-size> &lt;line-names> ]? ]+
43354333

43364334
<td>see individual properties
43374335

css-grid/Overview.src.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ <h3 id='grid-template-property'>
13491349
<tr>
13501350
<td>Value:
13511351
<td>none | <var>&lt;'grid-template-columns'></var> / <var>&lt;'grid-template-rows'></var> |
1352-
[ <var>&lt;'grid-template-columns'></var> / ]?
1352+
[ <var>&lt;track-list></var> / ]?
13531353
[ <var>&lt;line-names></var>? <var>&lt;string></var> [ <var>&lt;track-size></var> <var>&lt;line-names></var> ]? ]+
13541354

13551355
<tr>
@@ -1404,7 +1404,7 @@ <h3 id='grid-template-property'>
14041404
grid-template-areas: none;</pre>
14051405
</div>
14061406

1407-
<dt><dfn>[ <var>&lt;'grid-template-columns'></var> / ]?<br>
1407+
<dt><dfn>[ <var>&lt;track-list></var> / ]?<br>
14081408
[ <var>&lt;line-names></var>? <var>&lt;string></var> [ <var>&lt;track-size></var> <var>&lt;line-names></var> ]? ]+</dfn>
14091409
<dd>
14101410
<ul>

0 commit comments

Comments
 (0)