Skip to content

Commit ce27a97

Browse files
committed
[css-grid] Removed the sections about collapsing and gutters. The text has been moved to the wiki.
1 parent fbf88b5 commit ce27a97

2 files changed

Lines changed: 31 additions & 91 deletions

File tree

css-grid/Overview.html

Lines changed: 31 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ <h2 class="no-num no-toc no-ref" id=contents><span class=content>Table of conten
106106
Grid Layout Box Model</a><ul class=toc><li><a href=#grid-containers><span class=secno>3.1</span>
107107
Grid Containers: the <span data-link-type=value>grid</span> and <span class=css data-link-type=maybe>inline-grid</span> <span class=property data-link-type=propdesc title=display>display</span> values</a></ul><li><a href=#grid-items><span class=secno>4</span>
108108
Grid Items</a><ul class=toc><li><a href=#abspos-items><span class=secno>4.1</span>
109-
Absolutely-positioned Grid Children</a><li><a href=#visibility-collapse><span class=secno>4.2</span>
110-
Collapsed Grid Items: the <span class=property data-link-type=propdesc title=visibility>visibility</span> property</a><li><a href=#order-property><span class=secno>4.3</span>
109+
Absolutely-positioned Grid Children</a><li><a href=#order-property><span class=secno>4.2</span>
111110
Reordered Grid Items: the <span class=property data-link-type=propdesc title=order>order</span> property</a></ul><li><a href=#grid-definition><span class=secno>5</span>
112111
The Explicit Grid</a><ul class=toc><li><a href=#track-sizing><span class=secno>5.1</span>
113112
Track Sizing: the <span class=property data-link-type=propdesc title=grid-template-rows>grid-template-rows</span> and <span class=property data-link-type=propdesc title=grid-template-columns>grid-template-columns</span> properties</a><ul class=toc><li><a href=#named-lines><span class=secno>5.1.1</span>
@@ -127,18 +126,17 @@ <h2 class="no-num no-toc no-ref" id=contents><span class=content>Table of conten
127126
Implicit Grid Shorthand: the <span class=property data-link-type=propdesc title=grid-auto>grid-auto</span> property</a></ul><li><a href=#placement><span class=secno>7</span>
128127
Placing Grid Items</a><ul class=toc><li><a href=#line-placement><span class=secno>7.1</span>
129128
Line-based Placement: the <span class=property data-link-type=propdesc title=grid-row-start>grid-row-start</span>, <span class=property data-link-type=propdesc title=grid-column-start>grid-column-start</span>, <span class=property data-link-type=propdesc title=grid-row-end>grid-row-end</span>, and <span class=property data-link-type=propdesc title=grid-column-end>grid-column-end</span> properties</a><li><a href=#placement-shorthands><span class=secno>7.2</span>
130-
Placement Shorthands: the <span class=property data-link-type=propdesc title=grid-column>grid-column</span>, <span class=property data-link-type=propdesc title=grid-row>grid-row</span>, and <span class=property data-link-type=propdesc title=grid-area>grid-area</span> properties</a></ul><li><a href=#gutters><span class=secno>8</span>
131-
Gutters</a><li><a href=#alignment><span class=secno>9</span>
132-
Alignment</a><ul class=toc><li><a href=#auto-margins><span class=secno>9.1</span>
133-
Aligning with <span data-link-for=margin data-link-type=value>auto</span> margins</a><li><a href=#row-align><span class=secno>9.2</span>
134-
Row-axis Alignment: the <span class=property data-link-type=propdesc title=justify-self>justify-self</span> and <span class=property data-link-type=propdesc title=justify-items>justify-items</span> properties</a><li><a href=#column-align><span class=secno>9.3</span>
135-
Column-axis Alignment: the <span class=property data-link-type=propdesc title=align-self>align-self</span> and <span class=property data-link-type=propdesc title=align-items>align-items</span> properties</a><li><a href=#z-order><span class=secno>9.4</span>
136-
Z-axis Ordering: the <span class=property data-link-type=propdesc title=z-index>z-index</span> property</a><li><a href=#grid-baselines><span class=secno>9.5</span>
137-
Grid Baselines</a></ul><li><a href=#layout-algorithm><span class=secno>10</span>
138-
Grid Layout Algorithm</a><ul class=toc><li><a href=#algo-terms><span class=secno>10.1</span>
139-
Definition of Terms for use in Calculating Grid Track Sizes</a><li><a href=#grid-track-sizing-algorithm><span class=secno>10.2</span>
140-
Grid Track Sizing Algorithm</a><li><a href=#shrink-to-fit><span class=secno>10.3</span>
141-
Defining the Shrink-to-fit Behavior of Grid Elements</a></ul><li><a href=#pagination><span class=secno>11</span>
129+
Placement Shorthands: the <span class=property data-link-type=propdesc title=grid-column>grid-column</span>, <span class=property data-link-type=propdesc title=grid-row>grid-row</span>, and <span class=property data-link-type=propdesc title=grid-area>grid-area</span> properties</a></ul><li><a href=#alignment><span class=secno>8</span>
130+
Alignment</a><ul class=toc><li><a href=#auto-margins><span class=secno>8.1</span>
131+
Aligning with <span data-link-for=margin data-link-type=value>auto</span> margins</a><li><a href=#row-align><span class=secno>8.2</span>
132+
Row-axis Alignment: the <span class=property data-link-type=propdesc title=justify-self>justify-self</span> and <span class=property data-link-type=propdesc title=justify-items>justify-items</span> properties</a><li><a href=#column-align><span class=secno>8.3</span>
133+
Column-axis Alignment: the <span class=property data-link-type=propdesc title=align-self>align-self</span> and <span class=property data-link-type=propdesc title=align-items>align-items</span> properties</a><li><a href=#z-order><span class=secno>8.4</span>
134+
Z-axis Ordering: the <span class=property data-link-type=propdesc title=z-index>z-index</span> property</a><li><a href=#grid-baselines><span class=secno>8.5</span>
135+
Grid Baselines</a></ul><li><a href=#layout-algorithm><span class=secno>9</span>
136+
Grid Layout Algorithm</a><ul class=toc><li><a href=#algo-terms><span class=secno>9.1</span>
137+
Definition of Terms for use in Calculating Grid Track Sizes</a><li><a href=#grid-track-sizing-algorithm><span class=secno>9.2</span>
138+
Grid Track Sizing Algorithm</a><li><a href=#shrink-to-fit><span class=secno>9.3</span>
139+
Defining the Shrink-to-fit Behavior of Grid Elements</a></ul><li><a href=#pagination><span class=secno>10</span>
142140
Fragmenting Grid Layout</a><li><a href=#acknowledgements><span class=secno></span>
143141
Acknowledgements</a><li><a href=#changes><span class=secno></span>
144142
Changes</a><li><a href=#conformance><span class=secno></span>
@@ -783,21 +781,8 @@ <h3 data-level=4.1 id=abspos-items><span class=secno>4.1 </span><span class=cont
783781
elements that are absolutely-positioned to a <a href=#grid-container>grid container</a>
784782
do not take up space or otherwise participate in the layout of the grid.
785783

786-
<h3 data-level=4.2 id=visibility-collapse><span class=secno>4.2 </span><span class=content>
787-
Collapsed Grid Items: the <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visufx.html#propdef-visibility title=visibility>visibility</a> property</span><a class=section-link href=#visibility-collapse>§</a></h3>
788-
<!--
789-
<p>
790-
Specifying <span data-link-type="maybe" class="css">visibility: collapse</span> on a <a>grid item</a> causes it to become a <dfn export title="collapsed grid item|collapsed">collapsed grid item</dfn>.
791-
This has the same effect as <span data-link-type="maybe" class="css">visibility: hidden</span>,
792-
except that if all the <a>grid items</a> spanning a track are <a>collapsed</a>,
793-
the track's intrinsic size becomes zero.
794-
-->
795-
<p class=issue>
796-
We want the ability to collapse grid tracks (similar to collapsing flex items or table rows/columns), but we're not sure exactly how to do it.
797-
Ideas welcome, please post them to the list.
798-
799784

800-
<h3 data-level=4.3 id=order-property><span class=secno>4.3 </span><span class=content>
785+
<h3 data-level=4.2 id=order-property><span class=secno>4.2 </span><span class=content>
801786
Reordered Grid Items: the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-flexbox-1/#order title=order>order</a> property</span><a class=section-link href=#order-property>§</a></h3>
802787

803788
<p>
@@ -1878,24 +1863,8 @@ <h3 data-level=7.2 id=placement-shorthands><span class=secno>7.2 </span><span cl
18781863
Should <a class=property data-link-type=propdesc href=#propdef-grid-area title=grid-area>grid-area</a> be <a class=property data-link-type=propdesc title=grid-field>grid-field</a>?
18791864

18801865

1881-
<h2 data-level=8 id=gutters><span class=secno>8 </span><span class=content>
1882-
Gutters</span><a class=section-link href=#gutters>§</a></h2>
1883-
1884-
<div class=issue>
1885-
We should have some way of defining "gutter" columns/rows,
1886-
where content can never go
1887-
(unless it's spanning across two tracks).
1888-
Otherwise, auto-flow is completely broken when you manually add gutters,
1889-
and it's just much less convenient to add them manually.
1890-
1891-
<p> <a href=http://lists.w3.org/Archives/Public/www-style/2013May/0057.html>Lea's email on the subject.</a>
1892-
See <a href=http://lists.w3.org/Archives/Public/www-style/2013May/0077.html>our proposal</a>
1893-
and <a href=http://lists.w3.org/Archives/Public/www-style/2012Mar/0611.html>Tab's email on the subject</a>.
1894-
</div>
1895-
1896-
18971866

1898-
<h2 data-level=9 id=alignment><span class=secno>9 </span><span class=content>
1867+
<h2 data-level=8 id=alignment><span class=secno>8 </span><span class=content>
18991868
Alignment</span><a class=section-link href=#alignment>§</a></h2>
19001869

19011870
<p>
@@ -1918,7 +1887,7 @@ <h2 data-level=9 id=alignment><span class=secno>9 </span><span class=content>
19181887
<a href=#grid-item>grid items</a> will auto-size to fit their contents.
19191888

19201889

1921-
<h3 data-level=9.1 id=auto-margins><span class=secno>9.1 </span><span class=content>
1890+
<h3 data-level=8.1 id=auto-margins><span class=secno>8.1 </span><span class=content>
19221891
Aligning with <a data-link-for=margin data-link-type=value>auto</a> margins</span><a class=section-link href=#auto-margins>§</a></h3>
19231892

19241893
<p>
@@ -1952,7 +1921,7 @@ <h3 data-level=9.1 id=auto-margins><span class=secno>9.1 </span><span class=cont
19521921
</div>
19531922

19541923

1955-
<h3 data-level=9.2 id=row-align><span class=secno>9.2 </span><span class=content>
1924+
<h3 data-level=8.2 id=row-align><span class=secno>8.2 </span><span class=content>
19561925
Row-axis Alignment: the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#justify-self title=justify-self>justify-self</a> and <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#justify-items title=justify-items>justify-items</a> properties</span><a class=section-link href=#row-align>§</a></h3>
19571926

19581927
<p>
@@ -1973,7 +1942,7 @@ <h3 data-level=9.2 id=row-align><span class=secno>9.2 </span><span class=content
19731942

19741943

19751944

1976-
<h3 data-level=9.3 id=column-align><span class=secno>9.3 </span><span class=content>
1945+
<h3 data-level=8.3 id=column-align><span class=secno>8.3 </span><span class=content>
19771946
Column-axis Alignment: the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#align-self title=align-self>align-self</a> and <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#align-items title=align-items>align-items</a> properties</span><a class=section-link href=#column-align>§</a></h3>
19781947

19791948
<p>
@@ -1983,7 +1952,7 @@ <h3 data-level=9.3 id=column-align><span class=secno>9.3 </span><span class=cont
19831952
or <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-align-3/#align-items title=align-items>align-items</a> property on the <a href=#grid-container>grid container</a>,
19841953
as defined in <a data-biblio-type=normative data-link-type=biblio href=#css3-align title=CSS3-ALIGN>[CSS3-ALIGN]</a>.
19851954

1986-
<h3 data-level=9.4 id=z-order><span class=secno>9.4 </span><span class=content>
1955+
<h3 data-level=8.4 id=z-order><span class=secno>8.4 </span><span class=content>
19871956
Z-axis Ordering: the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#z-index title=z-index>z-index</a> property</span><a class=section-link href=#z-order>§</a></h3>
19881957

19891958

@@ -2038,7 +2007,7 @@ <h3 data-level=9.4 id=z-order><span class=secno>9.4 </span><span class=content>
20382007
&lt;div id="E"&gt;E&lt;/div&gt;
20392008
&lt;/div&gt;</pre> </div>
20402009

2041-
<h3 data-level=9.5 id=grid-baselines><span class=secno>9.5 </span><span class=content>
2010+
<h3 data-level=8.5 id=grid-baselines><span class=secno>8.5 </span><span class=content>
20422011
Grid Baselines</span><a class=section-link href=#grid-baselines>§</a></h3>
20432012

20442013
<p>
@@ -2087,10 +2056,10 @@ <h3 data-level=9.5 id=grid-baselines><span class=secno>9.5 </span><span class=co
20872056

20882057

20892058

2090-
<h2 data-level=10 id=layout-algorithm><span class=secno>10 </span><span class=content>
2059+
<h2 data-level=9 id=layout-algorithm><span class=secno>9 </span><span class=content>
20912060
Grid Layout Algorithm</span><a class=section-link href=#layout-algorithm>§</a></h2>
20922061

2093-
<h3 data-level=10.1 id=algo-terms><span class=secno>10.1 </span><span class=content>
2062+
<h3 data-level=9.1 id=algo-terms><span class=secno>9.1 </span><span class=content>
20942063
Definition of Terms for use in Calculating Grid Track Sizes</span><a class=section-link href=#algo-terms>§</a></h3>
20952064

20962065
<dl>
@@ -2116,7 +2085,7 @@ <h3 data-level=10.1 id=algo-terms><span class=secno>10.1 </span><span class=cont
21162085
</dl>
21172086

21182087

2119-
<h3 data-level=10.2 id=grid-track-sizing-algorithm><span class=secno>10.2 </span><span class=content>
2088+
<h3 data-level=9.2 id=grid-track-sizing-algorithm><span class=secno>9.2 </span><span class=content>
21202089
Grid Track Sizing Algorithm</span><a class=section-link href=#grid-track-sizing-algorithm>§</a></h3>
21212090
<ol>
21222091
<li>Call ComputedUsedBreadthOfGridTracks for Grid Columns to resolve their logical width.
@@ -2563,14 +2532,14 @@ <h3 data-level=10.2 id=grid-track-sizing-algorithm><span class=secno>10.2 </span
25632532
</dl>
25642533
</dl>
25652534

2566-
<h3 data-level=10.3 id=shrink-to-fit><span class=secno>10.3 </span><span class=content>
2535+
<h3 data-level=9.3 id=shrink-to-fit><span class=secno>9.3 </span><span class=content>
25672536
Defining the Shrink-to-fit Behavior of Grid Elements</span><a class=section-link href=#shrink-to-fit>§</a></h3>
25682537

25692538
<p>
25702539
The <a href=http://www.w3.org/TR/css3-box/#shrink-to-fit>CSS3 Box Model</a> defines the shrink-to-fit behavior of an element as min(max(preferred minimum width, available width), preferred width), with available width defined in the Box Model spec. Accordingly, for the <a href=#grid-container>grid container</a> we define the preferred minimum width as the sum of the UsedBreadths of the <a href=#grid-track>Grid tracks</a> just before step 3 in ComputeUsedBreadthOfGridTracks, and the preferred width as the sum of the UsedBreadths of the <a href=#grid-track>Grid tracks</a> after the entire track sizing algorithm has been run with infinite space.
25712540

25722541

2573-
<h2 data-level=11 id=pagination><span class=secno>11 </span><span class=content>
2542+
<h2 data-level=10 id=pagination><span class=secno>10 </span><span class=content>
25742543
Fragmenting Grid Layout</span><a class=section-link href=#pagination>§</a></h2>
25752544

25762545
<p class=issue>
@@ -2743,7 +2712,7 @@ <h2 class="no-num no-ref" id=index><span class=content>
27432712
<li>auto-placement cursor, <a href=#auto-placement-cursor title="section 6.2.1">6.2.1</a>
27442713
<li>auto (value), <a href=#valuedef-auto title="section 5.1">5.1</a>
27452714
<li>auto (value), <a href=#grid-placement-auto title="section 7.1">7.1</a>
2746-
<li>AvailableSpace, <a href=#AvailableSpace-definition title="section 10.1">10.1</a>
2715+
<li>AvailableSpace, <a href=#AvailableSpace-definition title="section 9.1">9.1</a>
27472716
<li>column, <a href=#columns title="section 2">2</a>
27482717
<li>column axis, <a href=#column-axis title="section 2">2</a>
27492718
<li>columns (value), <a href=#valuedef-columns title="section 6.2">6.2</a>
@@ -2787,27 +2756,27 @@ <h2 class="no-num no-ref" id=index><span class=content>
27872756
<li>&lt;line-name-list&gt;, <a href=#typedef-line-name-list title="section 5.1">5.1</a>
27882757
<li>&lt;line-names&gt;, <a href=#typedef-line-names title="section 5.1">5.1</a>
27892758
<li>max-content (value), <a href=#valuedef-max-content title="section 5.1">5.1</a>
2790-
<li>MaxTrackSizingFunction, <a href=#MaxTrackSizingFunction-definition title="section 10.1">10.1</a>
2759+
<li>MaxTrackSizingFunction, <a href=#MaxTrackSizingFunction-definition title="section 9.1">9.1</a>
27912760
<li>min-content (value), <a href=#valuedef-min-content title="section 5.1">5.1</a>
27922761
<li>minmax() (value), <a href=#valuedef-minmaxmin-max title="section 5.1">5.1</a>
2793-
<li>MinTrackSizingFunction, <a href=#MinTrackSizingFunction-definition title="section 10.1">10.1</a>
2762+
<li>MinTrackSizingFunction, <a href=#MinTrackSizingFunction-definition title="section 9.1">9.1</a>
27942763
<li>named grid area, <a href=#named-grid-areas title="section 5.2">5.2</a>
27952764
<li>named line, <a href=#named-lines0 title="section 5.1.1">5.1.1</a>
27962765
<li>none (value), <a href=#valuedef-none0 title="section 5.1">5.1</a>
27972766
<li>none (value), <a href=#valuedef-none1 title="section 5.2">5.2</a>
27982767
<li>none (value), <a href=#valuedef-none2 title="section 5.3">5.3</a>
27992768
<li>none (value), <a href=#valuedef-none title="section 6.2">6.2</a>
2800-
<li>order-modified grid order, <a href=#order-modified-grid-order title="section 9.5">9.5</a>
2801-
<li>participates in baseline alignment, <a href=#baseline-participation title="section 9.5">9.5</a>
2769+
<li>order-modified grid order, <a href=#order-modified-grid-order title="section 8.5">8.5</a>
2770+
<li>participates in baseline alignment, <a href=#baseline-participation title="section 8.5">8.5</a>
28022771
<li>&lt;percentage&gt; (value), <a href=#valuedef-percentage title="section 5.1">5.1</a>
28032772
<li>placement, <a href=#placement0 title="section 7.1">7.1</a>
2804-
<li>RemainingSpace, <a href=#RemainingSpace-definition title="section 10.1">10.1</a>
2773+
<li>RemainingSpace, <a href=#RemainingSpace-definition title="section 9.1">9.1</a>
28052774
<li>repeat(), <a href=#funcdef-repeat title="section 5.1.2">5.1.2</a>
28062775
<li>row, <a href=#rows title="section 2">2</a>
28072776
<li>row axis, <a href=#row-axis title="section 2">2</a>
28082777
<li>rows (value), <a href=#valuedef-rows title="section 6.2">6.2</a>
28092778
<li>sizing function, <a href=#sizing-function title="section 5.1">5.1</a>
2810-
<li>SpanCount, <a href=#SpanCount-definition title="section 10.1">10.1</a>
2779+
<li>SpanCount, <a href=#SpanCount-definition title="section 9.1">9.1</a>
28112780
<li>span &amp;&amp; [ &lt; || &lt;ident&gt; ] (value), <a href=#grid-placement-span-int title="section 7.1">7.1</a>
28122781
<li>&lt;string&gt;+ (value), <a href=#valuedef-string title="section 5.2">5.2</a>
28132782
<li>subgrid, <a href=#subgrid title="section 5.1.4">5.1.4</a>

css-grid/Overview.src.html

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -696,19 +696,6 @@ <h3 id="abspos-items">
696696
elements that are absolutely-positioned to a <a>grid container</a>
697697
do not take up space or otherwise participate in the layout of the grid.
698698

699-
<h3 id="visibility-collapse">
700-
Collapsed Grid Items: the 'visibility' property</h3>
701-
<!--
702-
<p>
703-
Specifying ''visibility: collapse'' on a <a>grid item</a> causes it to become a <dfn export title="collapsed grid item|collapsed">collapsed grid item</dfn>.
704-
This has the same effect as ''visibility: hidden'',
705-
except that if all the <a>grid items</a> spanning a track are <a>collapsed</a>,
706-
the track's intrinsic size becomes zero.
707-
-->
708-
<p class='issue'>
709-
We want the ability to collapse grid tracks (similar to collapsing flex items or table rows/columns), but we're not sure exactly how to do it.
710-
Ideas welcome, please post them to the list.
711-
712699

713700
<h3 id='order-property'>
714701
Reordered Grid Items: the 'order' property</h3>
@@ -1928,22 +1915,6 @@ <h3 id='placement-shorthands'>
19281915
Should 'grid-area' be 'grid-field'?
19291916

19301917

1931-
<h2 id='gutters'>
1932-
Gutters</h2>
1933-
1934-
<div class='issue'>
1935-
We should have some way of defining "gutter" columns/rows,
1936-
where content can never go
1937-
(unless it's spanning across two tracks).
1938-
Otherwise, auto-flow is completely broken when you manually add gutters,
1939-
and it's just much less convenient to add them manually.
1940-
1941-
<a href="http://lists.w3.org/Archives/Public/www-style/2013May/0057.html">Lea's email on the subject.</a>
1942-
See <a href="http://lists.w3.org/Archives/Public/www-style/2013May/0077.html">our proposal</a>
1943-
and <a href="http://lists.w3.org/Archives/Public/www-style/2012Mar/0611.html">Tab's email on the subject</a>.
1944-
</div>
1945-
1946-
19471918

19481919
<h2 id='alignment'>
19491920
Alignment</h2>

0 commit comments

Comments
 (0)