Skip to content

Commit 9f660c4

Browse files
committed
[css-grid] Minor grammar fixes for 'grid' and 'grid-template'.
1 parent fab7eb3 commit 9f660c4

2 files changed

Lines changed: 21 additions & 21 deletions

File tree

css-grid/Overview.html

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,7 @@
4545
list-style: none;
4646
}
4747
</style>
48-
</head>
49-
<body class=h-entry>
50-
<style scoped>
51-
#grid-property-breakdown tr:nth-child(3) td {
52-
width: 25%;
53-
border-style: solid;
54-
}
55-
</style>
56-
57-
<style scoped type=text/css>
48+
<style type=text/css>
5849
.example {
5950
clear:both
6051
}
@@ -80,14 +71,16 @@
8071
}
8172
</style>
8273

74+
</head>
75+
<body class=h-entry>
8376
<div class=head>
8477
<p data-fill-with=logo><a class=logo href=http://www.w3.org/>
8578
<img alt=W3C height=48 src=http://www.w3.org/Icons/w3c_home width=72>
8679
</a>
8780
</p>
8881
<h1 class="p-name no-ref" id=title>CSS Grid Layout Module Level 1</h1>
8982
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
90-
<span class=dt-updated><span class=value-title title=20140124>24 January 2014</span></span></span></h2>
83+
<span class=dt-updated><span class=value-title title=20140205>5 February 2014</span></span></span></h2>
9184
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-grid/>http://dev.w3.org/csswg/css-grid/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-grid-1/>http://www.w3.org/TR/css-grid-1/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-grid/>http://dev.w3.org/csswg/css-grid/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2013/WD-css3-grid-layout-20130402/ rel=previous>http://www.w3.org/TR/2013/WD-css3-grid-layout-20130402/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-grid-layout-20121106/ rel=previous>http://www.w3.org/TR/2012/WD-css3-grid-layout-20121106/</a>
9285
<dt>Feedback:</dt>
9386
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-grid%5D%20feedback">www-style@w3.org</a>
@@ -693,7 +686,7 @@ <h3 class="heading settled heading" data-level=3.1 id=grid-containers><span clas
693686
and the grid container’s margins do not collapse with the margins of its contents.
694687
<a data-link-type=dfn href=#grid-container title="grid containers">Grid containers</a> form a containing block for their contents
695688
<a href=http://www.w3.org/TR/CSS21/visudet.html#containing-block-details>exactly like block containers do</a>. <a data-biblio-type=normative data-link-type=biblio href=#css21 title=css21>[CSS21]</a>
696-
The <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> property applies to <a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a>.
689+
The <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> property applies to <a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a>.
697690

698691

699692
<p>
@@ -1186,7 +1179,7 @@ <h4 class="heading settled heading" data-level=5.1.4 id=subgrids><span class=sec
11861179
<li>
11871180
Layoutwise, the <a data-link-type=dfn href=#subgrid title=subgrid>subgrid</a>’s <a data-link-type=dfn href=#explicit-grid title="explicit grid">explicit grid</a> is always aligned with the corresponding section of the parent <a data-link-type=dfn href=#grid title=grid>grid</a>;
11881181
the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#align-content title=align-content>align-content</a>/<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#justify-content title=justify-content>justify-content</a> properties on it are ignored.
1189-
However, <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> does apply,
1182+
However, <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> does apply,
11901183
so the contents of the subgrid can be scrolled aside.
11911184
(Note: the act of scrolling does not affect layout.)
11921185

@@ -1389,7 +1382,7 @@ <h4 class="heading settled heading" data-level=5.2.2 id=implicit-named-areas><sp
13891382
<h3 class="heading settled heading" data-level=5.3 id=explicit-grid-shorthand><span class=secno>5.3 </span><span class=content>
13901383
Explicit Grid Shorthand: the <a class=property data-link-type=propdesc href=#propdef-grid-template title=grid-template>grid-template</a> property</span><a class=self-link href=#explicit-grid-shorthand></a></h3>
13911384

1392-
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-template>grid-template<a class=self-link href=#propdef-grid-template></a></dfn><tr><th>Value:<td>none | subgrid | <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 css-code" data-link-type=type href=#typedef-track-list title="<track-list>">&lt;track-list&gt;</a> / ]? [ <a class="production css-code" data-link-type=type href=#typedef-line-names title="<line-names>">&lt;line-names&gt;</a>? <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value title="<string>">&lt;string&gt;</a> [ <a class="production css-code" data-link-type=type href=#typedef-track-size title="<track-size>">&lt;track-size&gt;</a> <a class="production css-code" data-link-type=type href=#typedef-line-names title="<line-names>">&lt;line-names&gt;</a> ]? ]+<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>visual<tr><th>Computed value:<td>see individual properties<tr><th>Percentages:<td>see individual properties</table>
1385+
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-template>grid-template<a class=self-link href=#propdef-grid-template></a></dfn><tr><th>Value:<td>none | subgrid | <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 css-code" data-link-type=type href=#typedef-track-list title="<track-list>">&lt;track-list&gt;</a> / ]? [ <a class="production css-code" data-link-type=type href=#typedef-line-names title="<line-names>">&lt;line-names&gt;</a>? <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value title="<string>">&lt;string&gt;</a> <a class="production css-code" data-link-type=type href=#typedef-track-size title="<track-size>">&lt;track-size&gt;</a>? <a class="production css-code" data-link-type=type href=#typedef-line-names title="<line-names>">&lt;line-names&gt;</a>? ]+<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>visual<tr><th>Computed value:<td>see individual properties<tr><th>Percentages:<td>see individual properties</table>
13931386
<p>
13941387
The <a class=property data-link-type=propdesc href=#propdef-grid-template title=grid-template>grid-template</a> property is a shorthand for setting
13951388
<a class=property data-link-type=propdesc href=#propdef-grid-template-columns title=grid-template-columns>grid-template-columns</a>, <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-areas title=grid-template-areas>grid-template-areas</a> in a single declaration.
@@ -1807,7 +1800,7 @@ <h3 class="heading settled heading" data-level=6.3 id=grid-auto-position-propert
18071800
<h2 class="heading settled heading" data-level=7 id=grid-shorthand><span class=secno>7 </span><span class=content>
18081801
Grid Definition Shorthand: the <a class=property data-link-type=propdesc href=#propdef-grid title=grid>grid</a> property</span><a class=self-link href=#grid-shorthand></a></h2>
18091802

1810-
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid>grid<a class=self-link href=#propdef-grid></a></dfn><tr><th>Value:<td><a class=production data-link-type=propdesc href=#propdef-grid-template title=grid-template>&lt;‘grid-template’&gt;</a> | <a class=production data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>&lt;‘grid-auto-flow’&gt;</a> [ <a class=production data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>&lt;‘grid-auto-columns’&gt;</a> [ / <a class=production data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>&lt;‘grid-auto-rows’&gt;</a> ]? ]<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>visual<tr><th>Computed value:<td>see individual properties<tr><th>Percentages:<td>see individual properties</table>
1803+
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid>grid<a class=self-link href=#propdef-grid></a></dfn><tr><th>Value:<td><a class=production data-link-type=propdesc href=#propdef-grid-template title=grid-template>&lt;‘grid-template’&gt;</a> | [ <a class=production data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>&lt;‘grid-auto-flow’&gt;</a> [ <a class=production data-link-type=propdesc href=#propdef-grid-auto-columns title=grid-auto-columns>&lt;‘grid-auto-columns’&gt;</a> [ / <a class=production data-link-type=propdesc href=#propdef-grid-auto-rows title=grid-auto-rows>&lt;‘grid-auto-rows’&gt;</a> ]? ]? ]<tr><th>Initial:<td>see individual properties<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>see individual properties<tr><th>Media:<td>visual<tr><th>Computed value:<td>see individual properties<tr><th>Percentages:<td>see individual properties</table>
18111804
<p>
18121805
The <a class=property data-link-type=propdesc href=#propdef-grid title=grid>grid</a> property is a shorthand that sets
18131806
all of the explicit grid properties
@@ -1920,7 +1913,14 @@ <h3 class="heading settled heading" data-level=8.1 id=common-uses><span class=se
19201913
<td><a class=property data-link-type=propdesc href=#propdef-grid-row-end title=grid-row-end>grid-row-end</a>
19211914
</table>
19221915

1923-
<h4 class="heading settled heading" data-level=8.1.1 id=common-uses-named-areas><span class=secno>8.1.1 </span><span class=content>
1916+
<style scoped>
1917+
#grid-property-breakdown tr:nth-child(3) td {
1918+
width: 25%;
1919+
border-style: solid;
1920+
}
1921+
</style>
1922+
1923+
<h4 class="heading settled heading" data-level=8.1.1 id=common-uses-named-areas><span class=secno>8.1.1 </span><span class=content>
19241924
Named Areas</span><a class=self-link href=#common-uses-named-areas></a></h4>
19251925

19261926
<p> An item can be placed into a <a data-link-type=dfn href=#named-grid-area title="named grid area">named grid area</a>
@@ -2510,7 +2510,7 @@ <h3 class="heading settled heading" data-level=9.6 id=grid-baselines><span class
25102510

25112511
<p>
25122512
When calculating the baseline according to the above rules,
2513-
if the box contributing a baseline has an <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow title=overflow>overflow</a> value that allows scrolling,
2513+
if the box contributing a baseline has an <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-overflow-3/#overflow0 title=overflow>overflow</a> value that allows scrolling,
25142514
the box must be treated as being in its initial scroll position
25152515
for the purpose of determining its baseline.
25162516

@@ -3300,12 +3300,12 @@ <h2 class="no-num no-ref heading settled heading" id=property-index><span class=
33003300
<tr><th scope=row><a data-property="">grid-template-columns</a><td>none | &lt;track-list&gt; | subgrid &lt;line-name-list&gt;?<td>none<td>grid containers<td>no<td>see prose<td>visual<td>As specified, except for auto (see prose), with lengths made absolute
33013301
<tr><th scope=row><a data-property="">grid-template-rows</a><td>none | &lt;track-list&gt; | subgrid &lt;line-name-list&gt;?<td>none<td>grid containers<td>no<td>see prose<td>visual<td>As specified, except for auto (see prose), with lengths made absolute
33023302
<tr><th scope=row><a data-property="">grid-template-areas</a><td>none | &lt;string&gt;+<td>none<td>grid containers<td>no<td>n/a<td>visual<td>specified value
3303-
<tr><th scope=row><a data-property="">grid-template</a><td>none | subgrid | &lt;‘grid-template-columns’&gt; / &lt;‘grid-template-rows’&gt; | [ &lt;track-list&gt; / ]? [ &lt;line-names&gt;? &lt;string&gt; [ &lt;track-size&gt; &lt;line-names&gt; ]? ]+<td>see individual properties<td>grid containers<td>see individual properties<td>see individual properties<td>visual<td>see individual properties
3303+
<tr><th scope=row><a data-property="">grid-template</a><td>none | subgrid | &lt;‘grid-template-columns’&gt; / &lt;‘grid-template-rows’&gt; | [ &lt;track-list&gt; / ]? [ &lt;line-names&gt;? &lt;string&gt; &lt;track-size&gt;? &lt;line-names&gt;? ]+<td>see individual properties<td>grid containers<td>see individual properties<td>see individual properties<td>visual<td>see individual properties
33043304
<tr><th scope=row><a data-property="">grid-auto-columns</a><td>&lt;track-size&gt;<td>auto<td>grid containers<td>no<td>see Track Sizing<td>visual<td>see Track Sizing
33053305
<tr><th scope=row><a data-property="">grid-auto-rows</a><td>&lt;track-size&gt;<td>auto<td>grid containers<td>no<td>see Track Sizing<td>visual<td>see Track Sizing
33063306
<tr><th scope=row><a data-property="">grid-auto-flow</a><td>none | [ [ row | column ] &amp;&amp; dense? ]<td>none<td>grid containers<td>no<td>n/a<td>visual<td>specified value
33073307
<tr><th scope=row><a data-property="">grid-auto-position</a><td>&lt;grid-line&gt; / &lt;grid-line&gt;<td>1 / 1<td>grid containers<td>no<td>n/a<td>visual<td>specified value
3308-
<tr><th scope=row><a data-property="">grid</a><td>&lt;‘grid-template’&gt; | &lt;‘grid-auto-flow’&gt; [ &lt;‘grid-auto-columns’&gt; [ / &lt;‘grid-auto-rows’&gt; ]? ]<td>see individual properties<td>grid containers<td>see individual properties<td>see individual properties<td>visual<td>see individual properties
3308+
<tr><th scope=row><a data-property="">grid</a><td>&lt;‘grid-template’&gt; | [ &lt;‘grid-auto-flow’&gt; [ &lt;‘grid-auto-columns’&gt; [ / &lt;‘grid-auto-rows’&gt; ]? ]? ]<td>see individual properties<td>grid containers<td>see individual properties<td>see individual properties<td>visual<td>see individual properties
33093309
<tr><th scope=row><a data-property="">grid-row-start</a><td>&lt;grid-line&gt;<td>auto<td>grid items<td>no<td>n/a<td>visual<td>specified value
33103310
<tr><th scope=row><a data-property="">grid-column-start</a><td>&lt;grid-line&gt;<td>auto<td>grid items<td>no<td>n/a<td>visual<td>specified value
33113311
<tr><th scope=row><a data-property="">grid-row-end</a><td>&lt;grid-line&gt;<td>auto<td>grid items<td>no<td>n/a<td>visual<td>specified value

css-grid/Overview.src.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ <h3 id='explicit-grid-shorthand'>
13121312

13131313
<pre class='propdef'>
13141314
Name: grid-template
1315-
Value: none | subgrid | <<'grid-template-columns'>> / <<'grid-template-rows'>> |<br> [ <<track-list>> / ]? [ <<line-names>>? <<string>> [ <<track-size>> <<line-names>> ]? ]+
1315+
Value: none | subgrid | <<'grid-template-columns'>> / <<'grid-template-rows'>> |<br> [ <<track-list>> / ]? [ <<line-names>>? <<string>> <<track-size>>? <<line-names>>? ]+
13161316
Initial: see individual properties
13171317
Applies to: <a>grid containers</a>
13181318
Inherited: see individual properties
@@ -1783,7 +1783,7 @@ <h2 id='grid-shorthand'>
17831783

17841784
<pre class='propdef'>
17851785
Name: grid
1786-
Value: <<'grid-template'>> | <<'grid-auto-flow'>> [ <<'grid-auto-columns'>> [ / <<'grid-auto-rows'>> ]? ]
1786+
Value: <<'grid-template'>> | [ <<'grid-auto-flow'>> [ <<'grid-auto-columns'>> [ / <<'grid-auto-rows'>> ]? ]? ]
17871787
Initial: see individual properties
17881788
Applies to: <a>grid containers</a>
17891789
Inherited: see individual properties

0 commit comments

Comments
 (0)