Skip to content

Commit 18b76b2

Browse files
committed
[css-grid-1] Grid 2 integration editorial prep:
adjust line breaks, fix css-display terminology, move sentence to more appropriate section.
1 parent e312b9b commit 18b76b2

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

css-grid-1/Overview.bs

+13-7
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Former editor: Alex Mogilevsky, Microsoft Corporation, alexmog@microsoft.com
2929
Former editor: Phil Cupp, Microsoft Corporation, pcupp@microsoft.com
3030
Issue Tracking: Disposition of Comments https://drafts.csswg.org/css-grid-1/issues
3131
Abstract: This CSS module defines a two-dimensional grid-based layout system, optimized for user interface design. In the grid layout model, the children of a grid container can be positioned into arbitrary slots in a predefined flexible or fixed-size layout grid.
32-
Ignored Terms: containing block, <ident>, auto, grid-*-start, grid-*-end, flex factor, flex factors, block formatting context, grid-auto-position
32+
Ignored Terms: auto, grid-*-start, grid-*-end, flex factor, flex factors, grid-auto-position
3333
Ignored Vars: A, B, C, size-contribution, track-sizes, extra-space
3434
Link Defaults: css2 (property) margin/min-height/max-height/min-width/max-width, css-align-3 (value) stretch/baseline, css-position-3 (property) left, css-position-3 (property) position, css-writing-modes-3 (dfn) start/end
3535
At Risk: application of grid placement to absolutely-positioned boxes
@@ -864,14 +864,15 @@ Establishing Grid Containers: the ''display/grid'' and ''inline-grid'' 'display'
864864
that is <a>inline-level</a> when placed in <a>flow layout</a>.
865865
</dl>
866866

867-
A <dfn export>grid container</dfn> establishes a new <dfn export>grid formatting context</dfn> for its contents.
868-
This is the same as establishing a block formatting context,
867+
A <dfn export>grid container</dfn> establishes
868+
an [=independent formatting context|independent=] <dfn export>grid formatting context</dfn>
869+
for its contents.
870+
This is the same as establishing an independent [=block formatting context=],
869871
except that grid layout is used instead of block layout:
870872
floats do not intrude into the grid container,
871873
and the grid container's margins do not collapse with the margins of its contents.
872874
The contents of a <a>grid container</a> are laid out into a <a>grid</a>,
873875
with <a>grid lines</a> forming the boundaries of each <a>grid items</a>’ containing block.
874-
The 'overflow' property applies to <a>grid containers</a>.
875876

876877
Grid containers are not block containers,
877878
and so some properties that were designed with the assumption of block layout
@@ -932,6 +933,8 @@ Sizing Grid Containers</h3>
932933
<h3 id='overflow'>
933934
Scrollable Grid Overflow</h3>
934935

936+
The 'overflow' property applies to <a>grid containers</a>.
937+
935938
Just as it is included in intrinsic sizing (see above),
936939
the <a>grid</a> is also included
937940
in a <a>grid container</a>’s <a>scrollable overflow region</a>.
@@ -1749,7 +1752,8 @@ Syntax of ''repeat()''</h5>
17491752
It can only appear once in the <a>track list</a>,
17501753
but the same <a>track list</a> can also contain <<fixed-repeat>>s.
17511754

1752-
If the ''repeat()'' function ends up placing two <<line-names>> adjacent to each other,
1755+
If a ''repeat()'' function
1756+
ends up placing two <<line-names>> adjacent to each other,
17531757
the name lists are merged.
17541758
For example, ''repeat(2, [a] 1fr [b])'' is equivalent to ''[a] 1fr [b a] 1fr [b]''.
17551759

@@ -1908,7 +1912,8 @@ Flexible Lengths: the ''fr'' unit</h4>
19081912
<h4 id='computed-tracks'>
19091913
Computed Value of a Track Listing</h4>
19101914

1911-
A <dfn>computed track list</dfn> is a <a spec=infra>list</a>
1915+
A <dfn>computed track list</dfn>
1916+
is a <a spec=infra>list</a>
19121917
alternating between [=line name sets=] and [=track sections=],
19131918
with the first and last items being [=line name sets=].
19141919

@@ -1941,7 +1946,8 @@ Resolved Value of a Track Listing</h4>
19411946

19421947
When an element generates a [=grid container=] box,
19431948
the <a href="https://www.w3.org/TR/cssom/#resolved-values">resolved value</a>
1944-
of the 'grid-template-rows' and 'grid-template-columns' properties is the <a>used value</a>,
1949+
of its 'grid-template-rows' or 'grid-template-columns' property
1950+
is the <a>used value</a>,
19451951
serialized with:
19461952

19471953
<ul>

0 commit comments

Comments
 (0)