Skip to content

Commit 33eddbe

Browse files
committed
[css-grid] Correct minor inconsistencies in grid-placement def
--HG-- extra : rebase_source : c0d038911d329c3b6e34b1c6948d2f8ee716da39
1 parent f3315c8 commit 33eddbe

2 files changed

Lines changed: 39 additions & 15 deletions

File tree

css-grid/Overview.html

Lines changed: 29 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1547,8 +1547,7 @@ <h4 id=subgrids><span class=secno>5.1.4. </span> Subgrids: the ‘<a
15471547
href="#track-size-auto"><code class=css>auto</code></a>’, the number of
15481548
tracks is determined by the size of the <a
15491549
href="#subgrid0"><i>subgrid</i></a>’s <a
1550-
href="#implicit-grid"><i>implicit grid</i></a>, which is defined to also
1551-
be the <a href="#explicit-grid"><i>explicit grid</i></a>.
1550+
href="#implicit-grid"><i>implicit grid</i></a>.
15521551

15531552
<li> The <a href="#grid-placement-properties"><i>grid-placement
15541553
properties</i></a> of the <a href="#subgrid0"><i>subgrid</i></a>’s <a
@@ -2501,14 +2500,22 @@ <h3 id=line-placement><span class=secno>7.1. </span> Line-based Placement:
25012500
class=property>grid-column-end</code></a>’ properties (collectively, the
25022501
<dfn id=grid-placement-properties
25032502
title="grid-placement property|grid-placement properties">grid-placement
2504-
properties</dfn>) specify, respectively, the <i>before</i>, <i>start</i>,
2505-
<i>after</i>, and <i>end</i> <a href="#grid-line"><i>grid lines</i></a> of
2506-
a <a href="#grid-item"><i>grid item</i></a>’s <a
2507-
href="#grid-area"><i>grid area</i></a>. In each dimension (row or column),
2508-
they resolve to either a specific pair of lines (specifying a position and
2509-
implying a <a href="#grid-span"><i>grid span</i></a>), or just a <a
2510-
href="#grid-span"><i>grid span</i></a> (implying <i>auto-placement</i> in
2511-
that dimension).
2503+
properties</dfn>) specify, respectively, the <i>block-start</i>,
2504+
<i>inline-start</i>, <i>block-end</i>, and <i>inline-end</i> <a
2505+
href="#grid-line"><i>grid lines</i></a> of a <a href="#grid-item"><i>grid
2506+
item</i></a>’s <a href="#grid-area"><i>grid area</i></a>.
2507+
2508+
<p> In each dimension (row or column), they resolve to either a specific
2509+
pair of lines (yielding an <dfn id=explicit-grid-position>explicit grid
2510+
position</dfn> and <dfn id=explicit-grid-span>explicit grid span</dfn>),
2511+
or just an <a href="#explicit-grid-span"><i>explicit grid span</i></a> and
2512+
an <dfn id=automatic-grid-position>automatic grid position</dfn> (implying
2513+
<i>auto-placement</i> in that dimension). If the item is a <a
2514+
href="#subgrid0"><i>subgrid</i></a> in that dimension, it could
2515+
alternatively have an <dfn id=automatic-grid-span>automatic grid
2516+
span</dfn>, with either an <a href="#automatic-grid-position"><i
2517+
title="automatic grid position">automatic</i></a> or <a
2518+
href="#explicit-grid-position"><i>explicit grid position</i></a>.
25122519

25132520
<p> Values have the following meanings:
25142521

@@ -4056,6 +4063,12 @@ <h2 class=no-num id=index> Index</h2>
40564063
<li>auto, <a href="#track-size-auto"
40574064
title="section 5.1."><strong>5.1.</strong></a>
40584065

4066+
<li>automatic grid position, <a href="#automatic-grid-position"
4067+
title="section 7.1."><strong>7.1.</strong></a>
4068+
4069+
<li>automatic grid span, <a href="#automatic-grid-span"
4070+
title="section 7.1."><strong>7.1.</strong></a>
4071+
40594072
<li>AvailableSpace, <a href="#AvailableSpace-definition"
40604073
title="section 9.1."><strong>9.1.</strong></a>
40614074

@@ -4081,6 +4094,12 @@ <h2 class=no-num id=index> Index</h2>
40814094
<li>explicit grid, <a href="#explicit-grid"
40824095
title="section 5."><strong>5.</strong></a>
40834096

4097+
<li>explicit grid position, <a href="#explicit-grid-position"
4098+
title="section 7.1."><strong>7.1.</strong></a>
4099+
4100+
<li>explicit grid span, <a href="#explicit-grid-span"
4101+
title="section 7.1."><strong>7.1.</strong></a>
4102+
40844103
<li><var>&lt;flex></var>, <a href="#ltflex"
40854104
title="section 5.1."><strong>5.1.</strong></a>
40864105

css-grid/Overview.src.html

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,8 +1110,7 @@ <h4 id="subgrids">
11101110
The number of explicit tracks is given by its <i>grid span</i>,
11111111
rather than by 'grid-template-rows'/'grid-template-columns'.
11121112
If the <i>grid span</i> is ''auto'',
1113-
the number of tracks is determined by the size of the <i>subgrid</i>’s <i>implicit grid</i>,
1114-
which is defined to also be the <i>explicit grid</i>.
1113+
the number of tracks is determined by the size of the <i>subgrid</i>’s <i>implicit grid</i>.
11151114

11161115
<li>
11171116
The <i>grid-placement properties</i> of the <i>subgrid</i>’s <i>grid items</i>
@@ -1880,11 +1879,17 @@ <h3 id='line-placement'>
18801879
<p>
18811880
The 'grid-row-start', 'grid-column-start', 'grid-row-end', and 'grid-column-end' properties
18821881
(collectively, the <dfn title="grid-placement property|grid-placement properties">grid-placement properties</dfn>)
1883-
specify, respectively, the <i>before</i>, <i>start</i>, <i>after</i>, and <i>end</i>
1882+
specify, respectively, the <i>block-start</i>, <i>inline-start</i>, <i>block-end</i>, and <i>inline-end</i>
18841883
<i>grid lines</i> of a <i>grid item</i>’s <i>grid area</i>.
1884+
1885+
<p>
18851886
In each dimension (row or column), they resolve to either
1886-
a specific pair of lines (specifying a position and implying a <i>grid span</i>),
1887-
or just a <i>grid span</i> (implying <i>auto-placement</i> in that dimension).
1887+
a specific pair of lines (yielding an <dfn>explicit grid position</dfn> and <dfn>explicit grid span</dfn>),
1888+
or just an <i>explicit grid span</i> and an <dfn>automatic grid position</dfn>
1889+
(implying <i>auto-placement</i> in that dimension).
1890+
If the item is a <i>subgrid</i> in that dimension,
1891+
it could alternatively have an <dfn>automatic grid span</dfn>,
1892+
with either an <i title="automatic grid position">automatic</i> or <i>explicit grid position</i>.
18881893

18891894
<p>
18901895
Values have the following meanings:

0 commit comments

Comments
 (0)