Skip to content

Commit 392651d

Browse files
committed
[css-grid] Add prose describing when/where content distribution adds space.
1 parent 99129f1 commit 392651d

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

css-grid/Overview.bs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2521,7 +2521,7 @@ Aligning the Grid: the 'justify-content' and 'align-content' properties</h3>
25212521

25222522
If the <a>grid</a>’s outer edges do not correspond to the <a>grid container</a>’s content edges
25232523
(for example, if no columns are flex-sized),
2524-
the <a>grid</a> is aligned within the content box according to the 'justify-content' and 'align-content' properties on the <a>grid container</a>.
2524+
the <a>grid tracks</a> are aligned within the content box according to the 'justify-content' and 'align-content' properties on the <a>grid container</a>.
25252525

25262526
<div class='example'>
25272527
For example, the following grid is centered vertically,
@@ -2671,6 +2671,13 @@ Overall Sizing Algorithm</h3>
26712671
</div>
26722672

26732673
Issue: Is one cycle enough?
2674+
2675+
<li>
2676+
Finally, the <a>grid container</a> is sized
2677+
using the resulting size of the <a>grid</a> as its content size,
2678+
and the tracks are aligned within the <a>grid container</a>
2679+
according to the 'align-content' and 'justify-content' properties.
2680+
<span class="note">Note: This can introduce extra space within or between tracks.</a>
26742681
</ol>
26752682

26762683
Once the size of each <a>grid area</a> is thus established,

css-grid/Overview.html

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ <h1 class="p-name no-ref" id="title">CSS Grid Layout Module Level 1</h1>
746746

747747

748748
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
749-
<time class="dt-updated" datetime="2014-12-19">19 December 2014</time></span></h2>
749+
<time class="dt-updated" datetime="2014-12-20">20 December 2014</time></span></h2>
750750

751751

752752
<div data-fill-with="spec-metadata">
@@ -4811,7 +4811,7 @@ <h3 class="heading settled" data-level="10.4" id="grid-align"><span class="secno
48114811

48124812
<p>If the <a data-link-type="dfn" href="#grid">grid</a>’s outer edges do not correspond to the <a data-link-type="dfn" href="#grid-container">grid container</a>’s content edges
48134813
(for example, if no columns are flex-sized),
4814-
the <a data-link-type="dfn" href="#grid">grid</a> is aligned within the content box according to the <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-justify-content">justify-content</a> and <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-align-content">align-content</a> properties on the <a data-link-type="dfn" href="#grid-container">grid container</a>.</p>
4814+
the <a data-link-type="dfn" href="#grid-track">grid tracks</a> are aligned within the content box according to the <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-justify-content">justify-content</a> and <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-align-content">align-content</a> properties on the <a data-link-type="dfn" href="#grid-container">grid container</a>.</p>
48154815

48164816

48174817

@@ -5031,8 +5031,16 @@ <h3 class="heading settled" data-level="11.2" id="algo-overview"><span class="se
50315031

50325032
<p class="issue" id="issue-4f54519f"><a class="self-link" href="#issue-4f54519f"></a>Is one cycle enough?</p>
50335033

5034-
5034+
5035+
50355036
</li>
5037+
<li>
5038+
Finally, the <a data-link-type="dfn" href="#grid-container">grid container</a> is sized
5039+
using the resulting size of the <a data-link-type="dfn" href="#grid">grid</a> as its content size,
5040+
and the tracks are aligned within the <a data-link-type="dfn" href="#grid-container">grid container</a>
5041+
according to the <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-align-content">align-content</a> and <a class="property" data-link-type="propdesc" href="http://dev.w3.org/csswg/css-align-3/#propdef-justify-content">justify-content</a> properties.
5042+
<span class="note" role="note">Note: This can introduce extra space within or between tracks.
5043+
</span></li>
50365044
</ol>
50375045

50385046

0 commit comments

Comments
 (0)