Skip to content

Commit d7d76ab

Browse files
committed
[css-grid] Rename grid-auto-flow:rows|columns to row|column to match flex-flow, as suggested by Julian last year.
1 parent 89bfe84 commit d7d76ab

2 files changed

Lines changed: 39 additions & 39 deletions

File tree

css-grid/Overview.html

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
</p>
8888
<h1 class="p-name no-ref" id=title>CSS Grid Layout Module Level 1</h1>
8989
<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=20140122>22 January 2014</span></span></span></h2>
90+
<span class=dt-updated><span class=value-title title=20140124>24 January 2014</span></span></span></h2>
9191
<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>
9292
<dt>Feedback:</dt>
9393
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-grid%5D%20feedback">www-style@w3.org</a>
@@ -849,7 +849,7 @@ <h2 class="heading settled heading" data-level=5 id=grid-definition><span class=
849849
<h3 class="heading settled heading" data-level=5.1 id=track-sizing><span class=secno>5.1 </span><span class=content>
850850
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=self-link href=#track-sizing></a></h3>
851851

852-
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-template-columns>grid-template-columns<a class=self-link href=#propdef-grid-template-columns></a></dfn>, <dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-template-rows>grid-template-rows<a class=self-link href=#propdef-grid-template-rows></a></dfn><tr><th>Value:<td>none | <a class="production css-code" data-link-type=type href=#typedef-track-list title="<track-list>">&lt;track-list&gt;</a> | subgrid <a class="production css-code" data-link-type=type href=#typedef-line-name-list title="<line-name-list>">&lt;line-name-list&gt;</a>?<tr><th>Initial:<td>none<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>no<tr><th>Media:<td>visual<tr><th>Computed value:<td>As specified, except for <a class=css-code data-link-for=grid-template-columns data-link-type=value href=#valuedef-auto title=auto>auto</a> (see prose), with lengths made absolute<tr><th>Percentages:<td>see prose</table>
852+
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-template-columns>grid-template-columns<a class=self-link href=#propdef-grid-template-columns></a></dfn>, <dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-template-rows>grid-template-rows<a class=self-link href=#propdef-grid-template-rows></a></dfn><tr><th>Value:<td>none | <a class="production css-code" data-link-type=type href=#typedef-track-list title="<track-list>">&lt;track-list&gt;</a> | subgrid <a class="production css-code" data-link-type=type href=#typedef-line-name-list title="<line-name-list>">&lt;line-name-list&gt;</a>?<tr><th>Initial:<td>none<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>no<tr><th>Media:<td>visual<tr><th>Computed value:<td>As specified, except for <a class=css data-link-for=grid-template-columns data-link-type=maybe href=#valuedef-auto title=auto>auto</a> (see prose), with lengths made absolute<tr><th>Percentages:<td>see prose</table>
853853
<p>
854854
These properties specify,
855855
as a space-separated <dfn data-dfn-type=dfn data-export="" id=track-list>track list<a class=self-link href=#track-list></a></dfn>,
@@ -926,7 +926,7 @@ <h3 class="heading settled heading" data-level=5.1 id=track-sizing><span class=s
926926
Rather than specifying the sizes of rows/columns explicitly,
927927
they’ll be taken from the parent grid’s definition.
928928
If the <a data-link-type=dfn href=#grid-container title="grid container">grid container</a> is not a <a data-link-type=dfn href=#grid-item title="grid item">grid item</a>,
929-
this value computes to <a class=css-code data-link-for=grid-template-rows data-link-type=value href=#valuedef-none0 title=none>none</a>.
929+
this value computes to <a class=css data-link-for=grid-template-rows data-link-type=maybe href=#valuedef-none0 title=none>none</a>.
930930
See the <a href=#subgrids>Subgrids</a> section for more detail.
931931

932932
<div class=example>
@@ -1116,7 +1116,7 @@ <h4 class="heading settled heading" data-level=5.1.4 id=subgrids><span class=sec
11161116

11171117
<pre>ul {
11181118
display: grid;
1119-
grid-auto-flow: rows;
1119+
grid-auto-flow: row;
11201120
grid-template-columns: auto 1fr;
11211121
}
11221122
li {
@@ -1524,7 +1524,7 @@ <h3 class="heading settled heading" data-level=6.1 id=auto-tracks><span class=se
15241524
<h3 class="heading settled heading" data-level=6.2 id=grid-auto-flow-property><span class=secno>6.2 </span><span class=content>
15251525
Automatic Placement: the <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a> property</span><a class=self-link href=#grid-auto-flow-property></a></h3>
15261526

1527-
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-auto-flow>grid-auto-flow<a class=self-link href=#propdef-grid-auto-flow></a></dfn><tr><th>Value:<td>none | [ [ rows | columns ] &amp;&amp; dense? ]<tr><th>Initial:<td>none<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>no<tr><th>Media:<td>visual<tr><th>Computed value:<td>specified value<tr><th>Percentages:<td>n/a</table>
1527+
<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-grid-auto-flow>grid-auto-flow<a class=self-link href=#propdef-grid-auto-flow></a></dfn><tr><th>Value:<td>none | [ [ row | column ] &amp;&amp; dense? ]<tr><th>Initial:<td>none<tr><th>Applies to:<td><a data-link-type=dfn href=#grid-container title="grid containers">grid containers</a><tr><th>Inherited:<td>no<tr><th>Media:<td>visual<tr><th>Computed value:<td>specified value<tr><th>Percentages:<td>n/a</table>
15281528
<p>
15291529
<a data-link-type=dfn href=#grid-item title="grid items">Grid items</a> that aren’t explicitly placed are automatically placed into an unoccupied space in the <a data-link-type=dfn href=#grid-container title="grid container">grid container</a>.
15301530
The <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a> property controls the direction in which the search for unoccupied space takes place,
@@ -1536,13 +1536,13 @@ <h3 class="heading settled heading" data-level=6.2 id=grid-auto-flow-property><s
15361536
Rather than use the auto-placement algorithm,
15371537
auto-placed <a data-link-type=dfn href=#grid-item title="grid items">grid items</a> are simply positioned according to the <a class=property data-link-type=propdesc href=#propdef-grid-auto-position title=grid-auto-position>grid-auto-position</a> property.
15381538

1539-
<dt><dfn class=css-code data-dfn-for=grid-auto-flow data-dfn-type=value data-export="" id=valuedef-rows>rows<a class=self-link href=#valuedef-rows></a></dfn>
1539+
<dt><dfn class=css-code data-dfn-for=grid-auto-flow data-dfn-type=value data-export="" id=valuedef-row>row<a class=self-link href=#valuedef-row></a></dfn>
15401540
<dd>
15411541
The <a data-link-type=dfn href=#auto-placement title="auto-placement algorithm">auto-placement algorithm</a> places items
15421542
by filling each row in turn,
15431543
adding new rows as necessary.
15441544

1545-
<dt><dfn class=css-code data-dfn-for=grid-auto-flow data-dfn-type=value data-export="" id=valuedef-columns>columns<a class=self-link href=#valuedef-columns></a></dfn>
1545+
<dt><dfn class=css-code data-dfn-for=grid-auto-flow data-dfn-type=value data-export="" id=valuedef-column>column<a class=self-link href=#valuedef-column></a></dfn>
15461546
<dd>
15471547
The <a data-link-type=dfn href=#auto-placement title="auto-placement algorithm">auto-placement algorithm</a> places items
15481548
by filling each column in turn,
@@ -1560,8 +1560,8 @@ <h3 class="heading settled heading" data-level=6.2 id=grid-auto-flow-property><s
15601560

15611561
<p class=note> Note: A future level of this module is expected to add a value that flows auto-positioned items together into a single “default” cell.
15621562

1563-
<p class=issue id=issue-9dfd0726><a class=self-link href=#issue-9dfd0726></a>
1564-
Win8 compat might require the <a class=css-code data-link-for=grid-auto-flow data-link-type=value href=#valuedef-none title=none>none</a> value to stay the initial value,
1563+
<p class=issue id=issue-f18fa3f5><a class=self-link href=#issue-f18fa3f5></a>
1564+
Win8 compat might require the <a class=css data-link-for=grid-auto-flow data-link-type=maybe href=#valuedef-none title=none>none</a> value to stay the initial value,
15651565
but it’s not a very good value,
15661566
because by default the entire contents of a grid container will end up stacked on top of each other.
15671567
See <a href=http://lists.w3.org/Archives/Public/www-archive/2013Aug/0024.html>proposals to address this</a>
@@ -1574,7 +1574,7 @@ <h3 class="heading settled heading" data-level=6.2 id=grid-auto-flow-property><s
15741574
<p>
15751575
In the following example, there are three columns, each auto-sized to their contents.
15761576
No rows are explicitly defined.
1577-
The <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a> property is <a class=css-code data-link-for=grid-auto-flow data-link-type=value href=#valuedef-rows title=rows>rows</a>
1577+
The <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a> property is <a class=css data-link-for=grid-auto-flow data-link-type=maybe href=#valuedef-row title=row>row</a>
15781578
which instructs the grid to search across its three columns starting with the first row,
15791579
then the next,
15801580
adding rows as needed until sufficient space is located to accommodate the position of any auto-placed <a data-link-type=dfn href=#grid-item title="grid item">grid item</a>.
@@ -1592,7 +1592,7 @@ <h3 class="heading settled heading" data-level=6.2 id=grid-auto-flow-property><s
15921592
/* Define three columns, all content-sized,
15931593
and name the corresponding lines. */
15941594
grid-template-columns: (labels) auto (controls) auto (oversized) auto;
1595-
grid-auto-flow: rows;
1595+
grid-auto-flow: row;
15961596
}
15971597
form &gt; label {
15981598
/* Place all labels in the "labels" column and
@@ -1667,8 +1667,8 @@ <h4 class="heading settled heading" data-level=6.2.1 id=auto-placement-algo><spa
16671667
<p> The following <dfn data-dfn-type=dfn data-export="" id=auto-placement title="auto-placement|auto-placement algorithm">auto-placement algorithm<a class=self-link href=#auto-placement></a></dfn> places <a data-link-type=dfn href=#grid-item title="grid items">grid items</a> with <a data-link-type=dfn href=#automatic-grid-position title="automatic grid positions">automatic grid positions</a> into a <a data-link-type=dfn href=#definite-grid-position title="definite grid position">definite grid position</a>.
16681668

16691669
<p> To aid in clarity,
1670-
this algorithm is written with the assumption that <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a> is set to <a class=css-code data-link-for=grid-auto-flow data-link-type=value href=#valuedef-rows title=rows>rows</a>.
1671-
If it is instead set to <a class=css-code data-link-for=grid-auto-flow data-link-type=value href=#valuedef-columns title=columns>columns</a>,
1670+
this algorithm is written with the assumption that <a class=property data-link-type=propdesc href=#propdef-grid-auto-flow title=grid-auto-flow>grid-auto-flow</a> is set to <a class=css data-link-for=grid-auto-flow data-link-type=maybe href=#valuedef-row title=row>row</a>.
1671+
If it is instead set to <a class=css data-link-for=grid-auto-flow data-link-type=maybe href=#valuedef-column title=column>column</a>,
16721672
swap all mentions of rows and columns in this algorithm.
16731673

16741674
<p> For the purpose of this algorithm,
@@ -1721,7 +1721,7 @@ <h4 class="heading settled heading" data-level=6.2.1 id=auto-placement-algo><spa
17211721
<pre class=css> #grid {
17221722
display: grid;
17231723
grid-template-columns: repeat(5, 100px);
1724-
grid-auto-flow: rows;
1724+
grid-auto-flow: row;
17251725
}
17261726
#grid-item {
17271727
grid-column: 4 / span 3;
@@ -1826,11 +1826,11 @@ <h2 class="heading settled heading" data-level=7 id=grid-shorthand><span class=s
18261826
<pre>grid-template: none;
18271827
grid-auto-columns: 1fr;
18281828
grid-auto-rows: 1fr;
1829-
grid-auto-flow: rows;</pre> <p>Similarly, <a class=css data-link-type=propdesc href=#propdef-grid title=grid>grid: columns 1fr / auto</a> is equivalent to
1829+
grid-auto-flow: row;</pre> <p>Similarly, <a class=css data-link-type=propdesc href=#propdef-grid title=grid>grid: columns 1fr / auto</a> is equivalent to
18301830
<pre>grid-template: none;
18311831
grid-auto-columns: 1fr;
18321832
grid-auto-rows: auto;
1833-
grid-auto-flow: columns;</pre> </div>
1833+
grid-auto-flow: column;</pre> </div>
18341834

18351835
<h2 class="heading settled heading" data-level=8 id=placement><span class=secno>8 </span><span class=content>
18361836
Placing Grid Items</span><a class=self-link href=#placement></a></h2>
@@ -3189,9 +3189,9 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
31893189
<li>auto-placement algorithm, <a href=#auto-placement title="section 6.2.1">6.2.1</a>
31903190
<li>auto-placement cursor, <a href=#auto-placement-cursor title="section 6.2.1">6.2.1</a>
31913191
<li>AvailableSpace, <a href=#AvailableSpace-definition title="section 10.1">10.1</a>
3192-
<li>column, <a href=#grid-column- title="section 2">2</a>
3193-
<li>column axis, <a href=#column-axis title="section 2">2</a>
3194-
<li>columns, <a href=#valuedef-columns title="section 6.2">6.2</a>
3192+
<li>column<ul><li>definition of, <a href=#grid-column- title="section 2">2</a>
3193+
<li>value for grid-auto-flow, <a href=#valuedef-column title="section 6.2">6.2</a>
3194+
</ul><li>column axis, <a href=#column-axis title="section 2">2</a>
31953195
<li>&lt;custom-ident&gt;, <a href=#grid-placement-slot title="section 8.2">8.2</a>
31963196
<li>definite column position, <a href=#definite-grid-position title="section 8">8</a>
31973197
<li>definite column span, <a href=#definite-grid-span title="section 8">8</a>
@@ -3275,9 +3275,9 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
32753275
<li>placement, <a href=#grid-placement title="section 8">8</a>
32763276
<li>RemainingSpace, <a href=#RemainingSpace-definition title="section 10.1">10.1</a>
32773277
<li>repeat(), <a href=#funcdef-repeat title="section 5.1.2">5.1.2</a>
3278-
<li>row, <a href=#grid-row- title="section 2">2</a>
3279-
<li>row axis, <a href=#row-axis title="section 2">2</a>
3280-
<li>rows, <a href=#valuedef-rows title="section 6.2">6.2</a>
3278+
<li>row<ul><li>definition of, <a href=#grid-row- title="section 2">2</a>
3279+
<li>value for grid-auto-flow, <a href=#valuedef-row title="section 6.2">6.2</a>
3280+
</ul><li>row axis, <a href=#row-axis title="section 2">2</a>
32813281
<li>sizing function, <a href=#sizing-function title="section 5.1">5.1</a>
32823282
<li>SpanCount, <a href=#SpanCount-definition title="section 10.1">10.1</a>
32833283
<li>span &amp;&amp; [ &lt;integer&gt; || &lt;custom-ident&gt; ], <a href=#grid-placement-span-int title="section 8.2">8.2</a>
@@ -3303,7 +3303,7 @@ <h2 class="no-num no-ref heading settled heading" id=property-index><span class=
33033303
<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
3306-
<tr><th scope=row><a data-property="">grid-auto-flow</a><td>none | [ [ rows | columns ] &amp;&amp; dense? ]<td>none<td>grid containers<td>no<td>n/a<td>visual<td>specified value
3306+
<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
33083308
<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
@@ -3327,13 +3327,13 @@ <h2 class="no-num heading settled" id=issues-index><span class=content>Issues In
33273327
as a joiner between repetitions.
33283328

33293329
<a href=#issue-476380d2></a></div><div class=issue>
3330-
Win8 compat might require the <a class=css-code data-link-for=grid-auto-flow data-link-type=value href=#valuedef-none title=none>none</a> value to stay the initial value,
3330+
Win8 compat might require the <a class=css data-link-for=grid-auto-flow data-link-type=maybe href=#valuedef-none title=none>none</a> value to stay the initial value,
33313331
but it’s not a very good value,
33323332
because by default the entire contents of a grid container will end up stacked on top of each other.
33333333
See <a href=http://lists.w3.org/Archives/Public/www-archive/2013Aug/0024.html>proposals to address this</a>
33343334
while addressing use cases and back-compat.
33353335

3336-
<a href=#issue-9dfd0726></a></div><div class=issue>
3336+
<a href=#issue-f18fa3f5></a></div><div class=issue>
33373337
These properties might not be necessary in this level,
33383338
if we can provide a more reasonable default behavior
33393339
by, e.g., searching for an empty slot to stack items into

0 commit comments

Comments
 (0)