Skip to content

Commit 3de4c5f

Browse files
committed
[css-grid] Auto-placement uses 'order'-modified document order.
1 parent 703445f commit 3de4c5f

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

css-grid/Overview.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</a></p>
4343
<h1 class="p-name no-ref" id=title>CSS Grid Layout Module Level 1</h1>
4444
<h2 class="no-num no-toc no-ref" id=subtitle><span class=content>Editor's Draft,
45-
<span class=dt-updated><span class=value-title title=20130826>26 August 2013</span></span></span></h2>
45+
<span class=dt-updated><span class=value-title title=20130827>27 August 2013</span></span></span></h2>
4646
<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/css3-grid-layout/>http://www.w3.org/TR/css3-grid-layout/</a><dt>Editor's Draft:<dd><a href=http://dev.w3.org/csswg/css-grid/>http://dev.w3.org/csswg/css-grid/</a>
4747
<dt>Feedback:</dt>
4848
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-grid%5D%20feedback">www-style@w3.org</a>
@@ -1584,14 +1584,14 @@ <h4 data-level=6.2.1 id=auto-placement-algo><span class=secno>6.2.1 </span><span
15841584

15851585
<p> Before auto-positioning anything,
15861586
position every <a href=#grid-item>grid item</a>
1587-
with a <a href=#definite0>definite grid position</a> in both axises.
1587+
with a <a href=#definite0>definite grid position</a> in both axes.
15881588

15891589
<li>
15901590
<b>Process the items locked to a given row.</b>
15911591

15921592
<p> For each <a href=#grid-item>grid item</a> with a <a href=#definite0>definite row position</a>
15931593
(that is, the <a class=property data-link-type=propdesc href=#propdef-grid-row-start title=grid-row-start>grid-row-start</a> and <a class=property data-link-type=propdesc href=#propdef-grid-row-end title=grid-row-end>grid-row-end</a> properties define a <a href=#definite0>definite grid position</a>),
1594-
in source order,
1594+
in <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-flexbox-1/#propdef-order title=order>order</a>-modified document order,
15951595
position its <a href=http://dev.w3.org/csswg/css-writing-modes-3/#inline-start>inline-start</a> edge
15961596
to the earliest (smallest positive index) line index
15971597
that ensures this item’s <a href=#grid-area>grid area</a> will not overlap any <a href=#occupied-grid-cell>occupied grid cells</a>.
@@ -1644,7 +1644,7 @@ <h4 data-level=6.2.1 id=auto-placement-algo><span class=secno>6.2.1 </span><span
16441644
Initially the <a href=#auto-placement-cursor>auto-placement cursor</a> at is specified with a row and column position both equal to 1.
16451645

16461646
<p> For each <a href=#grid-item>grid item</a> that hasn't been positioned by the previous steps,
1647-
in source order:
1647+
in <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-flexbox-1/#propdef-order title=order>order</a>-modified document order:
16481648

16491649
<dl>
16501650
<dt>If the item has a <a href=#definite0>definite column position</a>:
@@ -1660,7 +1660,7 @@ <h4 data-level=6.2.1 id=auto-placement-algo><span class=secno>6.2.1 </span><span
16601660
Position the item's <a href=http://dev.w3.org/csswg/css-writing-modes-3/#block-start>block-start</a> edge to the <a href=#auto-placement-cursor>auto-placement cursor</a>’s row position.
16611661
</ol>
16621662

1663-
<dt>If the item has an <a href=#automatic0>automatic grid position</a> in both axises:
1663+
<dt>If the item has an <a href=#automatic0>automatic grid position</a> in both axes:
16641664
<dd>
16651665
<ol>
16661666
<li>
@@ -1696,7 +1696,7 @@ <h3 data-level=6.3 id=grid-auto-position-property><span class=secno>6.3 </span><
16961696
of a hypothetical <a href=#grid-item>grid item</a>,
16971697
treating <a data-link-for=grid-row-start data-link-type=value>auto</a> as <span class=css data-link-type=maybe>1</span> for this purpose.
16981698
The resulting lines of the <a href=#grid-container>grid container</a>
1699-
become a <a href=#definite0>definite grid position</a> in both axises
1699+
become a <a href=#definite0>definite grid position</a> in both axes
17001700
for the auto-placed <a href=#grid-item>grid items</a>.
17011701

17021702
<p class=issue>

css-grid/Overview.src.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,14 +1575,14 @@ <h4 id='auto-placement-algo'>
15751575

15761576
Before auto-positioning anything,
15771577
position every <a>grid item</a>
1578-
with a <a>definite grid position</a> in both axises.
1578+
with a <a>definite grid position</a> in both axes.
15791579

15801580
<li>
15811581
<b>Process the items locked to a given row.</b>
15821582

15831583
For each <a>grid item</a> with a <a>definite row position</a>
15841584
(that is, the 'grid-row-start' and 'grid-row-end' properties define a <a>definite grid position</a>),
1585-
in source order,
1585+
in 'order'-modified document order,
15861586
position its <a>inline-start</a> edge
15871587
to the earliest (smallest positive index) line index
15881588
that ensures this item’s <a>grid area</a> will not overlap any <a>occupied grid cells</a>.
@@ -1637,7 +1637,7 @@ <h4 id='auto-placement-algo'>
16371637
Initially the <a>auto-placement cursor</a> at is specified with a row and column position both equal to 1.
16381638

16391639
For each <a>grid item</a> that hasn't been positioned by the previous steps,
1640-
in source order:
1640+
in 'order'-modified document order:
16411641

16421642
<dl>
16431643
<dt>If the item has a <a>definite column position</a>:
@@ -1653,7 +1653,7 @@ <h4 id='auto-placement-algo'>
16531653
Position the item's <a>block-start</a> edge to the <a>auto-placement cursor</a>’s row position.
16541654
</ol>
16551655

1656-
<dt>If the item has an <a>automatic grid position</a> in both axises:
1656+
<dt>If the item has an <a>automatic grid position</a> in both axes:
16571657
<dd>
16581658
<ol>
16591659
<li>
@@ -1699,7 +1699,7 @@ <h3 id="grid-auto-position-property">
16991699
of a hypothetical <a>grid item</a>,
17001700
treating <a value for=grid-row-start>auto</a> as ''1'' for this purpose.
17011701
The resulting lines of the <a>grid container</a>
1702-
become a <a>definite grid position</a> in both axises
1702+
become a <a>definite grid position</a> in both axes
17031703
for the auto-placed <a>grid items</a>.
17041704

17051705
<p class="issue">

0 commit comments

Comments
 (0)