Skip to content

Commit c9a9e22

Browse files
committed
[css-grid] Remove lingering mentions of the head/foot keywords.
--HG-- extra : rebase_source : ce5aeefa71b976cc5c841ae7aef59724f4d955f5
1 parent 0330cd0 commit c9a9e22

2 files changed

Lines changed: 21 additions & 21 deletions

File tree

css-grid/Overview.bs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -494,8 +494,8 @@ Grid Areas</h3>
494494
/* Align items 2 and 3 at different points in the Grid Area "b". */
495495
/* By default, Grid Items are stretched to fit their Grid Area */
496496
/* and these items would layer one over the other. */
497-
#item2 { align-self: head }
498-
#item3 { justify-self: end; align-self: foot }
497+
#item2 { align-self: start }
498+
#item3 { justify-self: end; align-self: end }
499499
&lt;/style>
500500
</pre>
501501
</div>
@@ -2465,10 +2465,10 @@ Z-axis Ordering: the 'z-index' property</h3>
24652465
grid-template-columns: 1fr 1fr;
24662466
grid-template-rows: 1fr 1fr
24672467
}
2468-
#A { grid-column: 1 / span 2; grid-row: 2; align-self: foot }
2469-
#B { grid-column: 1; grid-row: 1; z-index: 10 }
2470-
#C { grid-column: 2; grid-row: 1; align-self: head; margin-left: -20px }
2471-
#D { grid-column: 2; grid-row: 2; justify-self: end; align-self: head }
2468+
#A { grid-column: 1 / span 2; grid-row: 2; align-self: end; }
2469+
#B { grid-column: 1; grid-row: 1; z-index: 10; }
2470+
#C { grid-column: 2; grid-row: 1; align-self: start; margin-left: -20px; }
2471+
#D { grid-column: 2; grid-row: 2; justify-self: end; align-self: start; }
24722472
#E { grid-column: 1 / span 2; grid-row: 1 / span 2;
24732473
z-index: 5; justify-self: center; align-self: center; }
24742474
&lt;/style>

css-grid/Overview.html

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</p>
9090
<h1 class="p-name no-ref" id=title>CSS Grid Layout Module Level 1</h1>
9191
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
92-
<span class=dt-updated><span class=value-title title=20140518>18 May 2014</span></span></span></h2>
92+
<span class=dt-updated><span class=value-title title=20140520>20 May 2014</span></span></span></h2>
9393
<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>
9494
<dt>Feedback:</dt>
9595
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-grid%5D%20feedback">www-style@w3.org</a>
@@ -546,9 +546,9 @@ <h2 class="heading settled heading" data-level=2 id=grid-concepts><span class=se
546546
that divides the <a data-link-type=dfn href=#grid-container title="grid container">grid container</a>’s space into <a data-link-type=dfn href=#grid-area title="grid areas">grid areas</a>,
547547
into which <a data-link-type=dfn href=#grid-item title="grid items">grid items</a> (representing the <a data-link-type=dfn href=#grid-container title="grid container">grid container</a>’s content) can be placed.
548548
There are two sets of <a data-link-type=dfn href=#grid-line title="grid lines">grid lines</a>:
549-
one set defining <dfn data-dfn-type=dfn data-export="" id=grid-column- title="grid column | column">columns<a class=self-link href=#grid-column-></a></dfn>
549+
one set defining <dfn data-dfn-type=dfn data-export="" id=grid-column title="grid column | column">columns<a class=self-link href=#grid-column></a></dfn>
550550
that run along the <a href=http://www.w3.org/TR/css3-writing-modes/#block-axis->block axis</a> (the <dfn data-dfn-type=dfn data-export="" id=column-axis>column axis<a class=self-link href=#column-axis></a></dfn>),
551-
and an orthogonal set defining <dfn data-dfn-type=dfn data-export="" id=grid-row- title="grid row | row">rows<a class=self-link href=#grid-row-></a></dfn>
551+
and an orthogonal set defining <dfn data-dfn-type=dfn data-export="" id=grid-row title="grid row | row">rows<a class=self-link href=#grid-row></a></dfn>
552552
along the <a href=http://www.w3.org/TR/css3-writing-modes/#inline-axis->inline axis</a> (the <dfn data-dfn-type=dfn data-export="" id=row-axis>row axis<a class=self-link href=#row-axis></a></dfn>).
553553
<a data-biblio-type=normative data-link-type=biblio href=#css3-writing-modes title=css3-writing-modes>[CSS3-WRITING-MODES]</a></p>
554554

@@ -562,7 +562,7 @@ <h2 class="heading settled heading" data-level=2 id=grid-concepts><span class=se
562562
<h3 class="heading settled heading" data-level=2.1 id=grid-track-concept><span class=secno>2.1 </span><span class=content>
563563
Grid Tracks and Cells</span><a class=self-link href=#grid-track-concept></a></h3>
564564

565-
<p><dfn data-dfn-type=dfn data-export="" id=grid-track>Grid track<a class=self-link href=#grid-track></a></dfn> is a generic term for a <a data-link-type=dfn href=#grid-column- title="grid column">grid column</a> or <a data-link-type=dfn href=#grid-row- title="grid row">grid row</a>—in
565+
<p><dfn data-dfn-type=dfn data-export="" id=grid-track>Grid track<a class=self-link href=#grid-track></a></dfn> is a generic term for a <a data-link-type=dfn href=#grid-column title="grid column">grid column</a> or <a data-link-type=dfn href=#grid-row title="grid row">grid row</a>—in
566566
other words, it is the space between two adjacent <a data-link-type=dfn href=#grid-line title="grid lines">grid lines</a>.
567567
Each <a data-link-type=dfn href=#grid-track title="grid track">grid track</a> is assigned a sizing function,
568568
which controls how wide or tall the column or row may grow,
@@ -665,8 +665,8 @@ <h3 class="heading settled heading" data-level=2.3 id=grid-area-concept><span cl
665665
/* Align items 2 and 3 at different points in the Grid Area "b". */
666666
/* By default, Grid Items are stretched to fit their Grid Area */
667667
/* and these items would layer one over the other. */
668-
#item2 { align-self: head }
669-
#item3 { justify-self: end; align-self: foot }
668+
#item2 { align-self: start }
669+
#item3 { justify-self: end; align-self: end }
670670
&lt;/style&gt;
671671
</pre>
672672
</div>
@@ -2388,7 +2388,7 @@ <h3 class="heading settled heading" data-level=9.1 id=auto-margins><span class=s
23882388
Aligning with <a class=css-code data-link-for=margin data-link-type=value title=auto>auto</a> margins</span><a class=self-link href=#auto-margins></a></h3>
23892389

23902390
<p><em>This section is non-normative.
2391-
The normative definition of how margins affect grid items is in <a data-section="" href=#layout-algorithm>§10
2391+
The normative definition of how margins affect grid items is in <a data-section="" href=#layout-algorithm>
23922392
Track Sizing Algorithm</a>.</em></p>
23932393

23942394
<p>Auto margins on <a data-link-type=dfn href=#grid-item title="grid items">grid items</a> have an effect very similar to auto margins in block flow:</p>
@@ -2500,10 +2500,10 @@ <h3 class="heading settled heading" data-level=9.5 id=z-order><span class=secno>
25002500
grid-template-columns: 1fr 1fr;
25012501
grid-template-rows: 1fr 1fr
25022502
}
2503-
#A { grid-column: 1 / span 2; grid-row: 2; align-self: foot }
2504-
#B { grid-column: 1; grid-row: 1; z-index: 10 }
2505-
#C { grid-column: 2; grid-row: 1; align-self: head; margin-left: -20px }
2506-
#D { grid-column: 2; grid-row: 2; justify-self: end; align-self: head }
2503+
#A { grid-column: 1 / span 2; grid-row: 2; align-self: end; }
2504+
#B { grid-column: 1; grid-row: 1; z-index: 10; }
2505+
#C { grid-column: 2; grid-row: 1; align-self: start; margin-left: -20px; }
2506+
#D { grid-column: 2; grid-row: 2; justify-self: end; align-self: start; }
25072507
#E { grid-column: 1 / span 2; grid-row: 1 / span 2;
25082508
z-index: 5; justify-self: center; align-self: center; }
25092509
&lt;/style&gt;
@@ -3271,7 +3271,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
32713271
<li>auto-placement cursor, <a href=#auto-placement-cursor title="section 6.2.1">6.2.1</a>
32723272
<li>available space, <a href=#available-space title="section 10.1">10.1</a>
32733273
<li>base size, <a href=#base-size title="section 10.2">10.2</a>
3274-
<li>column<ul><li>definition of, <a href=#grid-column- title="section 2">2</a>
3274+
<li>column<ul><li>definition of, <a href=#grid-column title="section 2">2</a>
32753275
<li>value for grid-auto-flow, <a href=#valuedef-column title="section 6.2">6.2</a>
32763276
</ul><li>column axis, <a href=#column-axis title="section 2">2</a>
32773277
<li>&lt;custom-ident&gt;, <a href=#grid-placement-slot title="section 8.2">8.2</a>
@@ -3303,7 +3303,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
33033303
<li>grid-auto-flow, <a href=#propdef-grid-auto-flow title="section 6.2">6.2</a>
33043304
<li>grid-auto-rows, <a href=#propdef-grid-auto-rows title="section 6.1">6.1</a>
33053305
<li>grid cell, <a href=#grid-cell title="section 2.1">2.1</a>
3306-
<li>grid column, <a href=#grid-column- title="section 2">2</a>
3306+
<li>grid column, <a href=#grid-column title="section 2">2</a>
33073307
<li>grid-column, <a href=#propdef-grid-column title="section 8.3">8.3</a>
33083308
<li>grid-column-end, <a href=#propdef-grid-column-end title="section 8.2">8.2</a>
33093309
<li>grid column line, <a href=#grid-line title="section 2.2">2.2</a>
@@ -3317,7 +3317,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
33173317
<li>grid placement, <a href=#grid-placement title="section 8">8</a>
33183318
<li>grid-placement property, <a href=#grid-placement-property title="section 8">8</a>
33193319
<li>grid position, <a href=#grid-position title="section 8">8</a>
3320-
<li>grid row, <a href=#grid-row- title="section 2">2</a>
3320+
<li>grid row, <a href=#grid-row title="section 2">2</a>
33213321
<li>grid-row, <a href=#propdef-grid-row title="section 8.3">8.3</a>
33223322
<li>grid-row-end, <a href=#propdef-grid-row-end title="section 8.2">8.2</a>
33233323
<li>grid row line, <a href=#grid-line title="section 2.2">2.2</a>
@@ -3367,7 +3367,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
33673367
<li>&lt;percentage&gt;, <a href=#valuedef-percentage title="section 5.1">5.1</a>
33683368
<li>placement, <a href=#grid-placement title="section 8">8</a>
33693369
<li>repeat(), <a href=#funcdef-repeat title="section 5.1.2">5.1.2</a>
3370-
<li>row<ul><li>definition of, <a href=#grid-row- title="section 2">2</a>
3370+
<li>row<ul><li>definition of, <a href=#grid-row title="section 2">2</a>
33713371
<li>value for grid-auto-flow, <a href=#valuedef-row title="section 6.2">6.2</a>
33723372
</ul><li>row axis, <a href=#row-axis title="section 2">2</a>
33733373
<li>sizing function, <a href=#track-sizing-function title="section 5.1">5.1</a>

0 commit comments

Comments
 (0)