Skip to content

Commit cca98c8

Browse files
committed
[css-grid] Shuffle the definitions of none/subgrid higher, so they're easier to find.
1 parent 5d051d9 commit cca98c8

2 files changed

Lines changed: 27 additions & 24 deletions

File tree

css-grid/Overview.bs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -816,6 +816,15 @@ Track Sizing: the 'grid-template-rows' and 'grid-template-columns' properties</h
816816

817817
The 'grid-template-columns' property specifies the <a>track list</a> for the grid's columns,
818818
while 'grid-template-rows' specifies the <a>track list</a> for the grid's rows.
819+
820+
The <dfn value for="grid-template-rows grid-template-columns">none</dfn> value indicates that there is no <a>explicit grid</a>;
821+
any rows/columns will be implicitly generated,
822+
and their size will be determined by the 'grid-auto-rows' and 'grid-auto-columns' properties.
823+
824+
The <dfn value for="grid-template-rows grid-template-columns">subgrid</dfn> value indicates that the grid will align to its parent grid in that axis.
825+
Rather than specifying the sizes of rows/columns explicitly,
826+
they'll be taken from the parent grid's definition.
827+
819828
The syntax of a <a>track list</a> is:
820829

821830
<pre>
@@ -876,14 +885,6 @@ Track Sizing: the 'grid-template-rows' and 'grid-template-columns' properties</h
876885
Computes to ''minmax(min-content, max-content)''.
877886
</dl>
878887

879-
The <dfn value for="grid-template-rows grid-template-columns">none</dfn> value indicates that there is no <a>explicit grid</a>;
880-
any rows/columns will be implicitly generated,
881-
and their size will be determined by the 'grid-auto-rows' and 'grid-auto-columns' properties.
882-
883-
The <dfn value for="grid-template-rows grid-template-columns">subgrid</dfn> value indicates that the grid will align to its parent grid in that axis.
884-
Rather than specifying the sizes of rows/columns explicitly,
885-
they'll be taken from the parent grid's definition.
886-
887888
<div class='example'>
888889
Given the following 'grid-template-columns' declaration:
889890

@@ -1058,8 +1059,8 @@ Subgrids: the ''grid-template-rows/subgrid'' keyword</h4>
10581059
participate in sizing the <a>grid</a> of the parent <a>grid container</a>,
10591060
allowing the contents of both grids to align.
10601061

1061-
If a <a>grid container</a> that is <em>not</em> a <a>grid item</a> uses the ''subgrid'' keyword,
1062-
it 'grid-template-rows'/'grid-template-columns' value is treated identically to ''none''
1062+
If a <a>grid container</a> that is <em>not</em> a <a>grid item</a> uses the ''grid-template-rows/subgrid'' keyword,
1063+
it 'grid-template-rows'/'grid-template-columns' value is treated identically to ''grid-template-rows/none''
10631064
(i.e. it doesn't have an <a>explicit grid</a> in that dimension).
10641065

10651066
<div class="example">

css-grid/Overview.html

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,8 +1959,20 @@ <h3 class="heading settled" data-level="5.1" id="track-sizing"><span class="secn
19591959

19601960

19611961
<p>The <a class="property" data-link-type="propdesc" href="#propdef-grid-template-columns">grid-template-columns</a> property specifies the <a data-link-type="dfn" href="#track-list">track list</a> for the grid’s columns,
1962-
while <a class="property" data-link-type="propdesc" href="#propdef-grid-template-rows">grid-template-rows</a> specifies the <a data-link-type="dfn" href="#track-list">track list</a> for the grid’s rows.
1963-
The syntax of a <a data-link-type="dfn" href="#track-list">track list</a> is:</p>
1962+
while <a class="property" data-link-type="propdesc" href="#propdef-grid-template-rows">grid-template-rows</a> specifies the <a data-link-type="dfn" href="#track-list">track list</a> for the grid’s rows.</p>
1963+
1964+
1965+
<p>The <dfn class="css" data-dfn-for="grid-template-rows grid-template-columns" data-dfn-type="value" data-export="" id="valdef-grid-template-rows-grid-template-columns-none">none<a class="self-link" href="#valdef-grid-template-rows-grid-template-columns-none"></a></dfn> value indicates that there is no <a data-link-type="dfn" href="#explicit-grid">explicit grid</a>;
1966+
any rows/columns will be implicitly generated,
1967+
and their size will be determined by the <a class="property" data-link-type="propdesc" href="#propdef-grid-auto-rows">grid-auto-rows</a> and <a class="property" data-link-type="propdesc" href="#propdef-grid-auto-columns">grid-auto-columns</a> properties.</p>
1968+
1969+
1970+
<p>The <dfn class="css" data-dfn-for="grid-template-rows grid-template-columns" data-dfn-type="value" data-export="" id="valdef-grid-template-rows-grid-template-columns-subgrid">subgrid<a class="self-link" href="#valdef-grid-template-rows-grid-template-columns-subgrid"></a></dfn> value indicates that the grid will align to its parent grid in that axis.
1971+
Rather than specifying the sizes of rows/columns explicitly,
1972+
they’ll be taken from the parent grid’s definition.</p>
1973+
1974+
1975+
<p>The syntax of a <a data-link-type="dfn" href="#track-list">track list</a> is:</p>
19641976

19651977

19661978
<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>?
@@ -2037,16 +2049,6 @@ <h3 class="heading settled" data-level="5.1" id="track-sizing"><span class="secn
20372049
</dd>
20382050
</dl>
20392051

2040-
2041-
<p>The <dfn class="css" data-dfn-for="grid-template-rows grid-template-columns" data-dfn-type="value" data-export="" id="valdef-grid-template-rows-grid-template-columns-none">none<a class="self-link" href="#valdef-grid-template-rows-grid-template-columns-none"></a></dfn> value indicates that there is no <a data-link-type="dfn" href="#explicit-grid">explicit grid</a>;
2042-
any rows/columns will be implicitly generated,
2043-
and their size will be determined by the <a class="property" data-link-type="propdesc" href="#propdef-grid-auto-rows">grid-auto-rows</a> and <a class="property" data-link-type="propdesc" href="#propdef-grid-auto-columns">grid-auto-columns</a> properties.</p>
2044-
2045-
2046-
<p>The <dfn class="css" data-dfn-for="grid-template-rows grid-template-columns" data-dfn-type="value" data-export="" id="valdef-grid-template-rows-grid-template-columns-subgrid">subgrid<a class="self-link" href="#valdef-grid-template-rows-grid-template-columns-subgrid"></a></dfn> value indicates that the grid will align to its parent grid in that axis.
2047-
Rather than specifying the sizes of rows/columns explicitly,
2048-
they’ll be taken from the parent grid’s definition.</p>
2049-
20502052

20512053
<div class="example">
20522054
Given the following <a class="property" data-link-type="propdesc" href="#propdef-grid-template-columns">grid-template-columns</a> declaration:
@@ -2269,8 +2271,8 @@ <h4 class="heading settled" data-level="5.1.4" id="subgrids"><span class="secno"
22692271
allowing the contents of both grids to align.</p>
22702272

22712273

2272-
<p>If a <a data-link-type="dfn" href="#grid-container">grid container</a> that is <em>not</em> a <a data-link-type="dfn" href="#grid-item">grid item</a> uses the <a class="css" data-link-type="maybe" href="#valdef-grid-template-rows-grid-template-columns-subgrid">subgrid</a> keyword,
2273-
it <a class="property" data-link-type="propdesc" href="#propdef-grid-template-rows">grid-template-rows</a>/<a class="property" data-link-type="propdesc" href="#propdef-grid-template-columns">grid-template-columns</a> value is treated identically to <a class="css" data-link-type="maybe" href="#valdef-grid-template-rows-grid-template-columns-none">none</a>
2274+
<p>If a <a data-link-type="dfn" href="#grid-container">grid container</a> that is <em>not</em> a <a data-link-type="dfn" href="#grid-item">grid item</a> uses the <a class="css" data-link-for="grid-template-rows" data-link-type="maybe" href="#valdef-grid-template-rows-grid-template-columns-subgrid">subgrid</a> keyword,
2275+
it <a class="property" data-link-type="propdesc" href="#propdef-grid-template-rows">grid-template-rows</a>/<a class="property" data-link-type="propdesc" href="#propdef-grid-template-columns">grid-template-columns</a> value is treated identically to <a class="css" data-link-for="grid-template-rows" data-link-type="maybe" href="#valdef-grid-template-rows-grid-template-columns-none">none</a>
22742276
(i.e. it doesn’t have an <a data-link-type="dfn" href="#explicit-grid">explicit grid</a> in that dimension).</p>
22752277

22762278

0 commit comments

Comments
 (0)