[css-grid-3] Per WG resolution, use the grid template and placement properties. #11243

Author: tabatkins

css-grid-3/Overview.bs

@@ -186,25 +186,6 @@ One-dimensional Grid Layout</h4>
 		</figure>
 	</div>
 
-<h3 id="alternative-proposals">
-Alternative Syntax Proposals</h3>
-
-	<div class="issue">
-		The masonry layout feature of this specification is drafted with two different syntaxes
-		to promote debate and discussion of these two alternatives.
-
-		<dl>
-			<dt><dfn noexport><span class="option grid">Grid-integrated Option</span></dfn>
-			<dd>
-				In this syntax model, [=masonry layout=] is integrated into the [=grid layout=] model,
-				re-using all of the 'grid-*' properties.
-
-			<dt><dfn noexport><span class="option masonry">Grid-independent Option</span></dfn>
-			<dd>
-				In this syntax model, [=masonry layout=] is its own 'display' type,
-			and has its own parallel set of 'masonry-*' properties.
-		</dl>
-	</div>
 
 <h3 id="values">
 Value Definitions</h3>
@@ -595,84 +576,17 @@ Masonry Track Specification</h2>
 	thus, the tracks themselves must already have a definite size
 	so that the items know their [=available space=] during layout.
 
-<section class="option grid">
 <h3 id="masonry-track-grid-option">
-<span class="option grid">Grid-integrated Option:</span> Declaring Masonry Track Templates: the 'grid-template-*' properties</h3>
+Declaring Masonry Track Templates: the 'grid-template-*' properties</h3>
 
 	The 'grid-template-*' and 'grid-auto-rows'/'grid-auto-columns' properties
 	(and their shorthands)
 	apply in the [=grid axis=] of the [=masonry container=]
 	and establish tracks just as on regular [=grid containers=].
+	(They are ignored in the [=stacking axis=].)
 
 	ISSUE(10869): What should be the initial track listing?
-</section>
-
-<section class="option masonry">
-<h3 id="masonry-track-masonry-option">
-<span class="option masonry">Grid-independent Option:</span> Declaring Masonry Track Templates: the 'masonry-template-*' properties</h3>
-
-	Tracks in the [=grid axis=] of a [=masonry container=]
-	are established with 'masonry-template-tracks',
-	'masonry-template-areas',
-	and 'masonry-auto-tracks'.
-
-	<pre class=propdef>
-	Name: masonry-template-tracks
-	Value: none | <<track-list>> | <<masonry-auto-track-list>> | subgrid <<line-name-list>>?
-	Initial: repeat(auto-areas, auto)
-	Applies to: [=masonry containers=]
-	Inherited: no
-	Percentages: refer to corresponding dimension of the content area
-	Computed value: by computed value type per item in the [=computed track list=]
-	Animation type: if list lengths match, by [=computed value=] type; otherwise, discrete
-	</pre>
-
-	The syntax of 'masonry-template-tracks' is a superset of 'grid-template-columns';
-	all shared values have identical interpretations.
-	(The additional values are that <<masonry-auto-track-list>>,
-	unlike <<auto-track-list>> in 'grid-template-columns',
-	allows intrinsic sizes to be combined with auto repetition;
-	see [[#masonry-intrinsic-repeat]] for details.)
 
-	It also has a different initial value:
-	''repeat(auto-areas, auto)'' rather than ''grid-template-columns/none''.
-
-	ISSUE(10869): What should be the initial value?
-
-	<pre class=prod>
-		<dfn>&lt;masonry-auto-track-list></dfn> = [ <<line-names>>? [ <<track-size>> | <<track-repeat>> ] ]*
-		                            <<line-names>>? <<auto-repeat>> <<line-names>>?
-		                            [ [ <<track-size>> | <<track-repeat>> ] <<line-names>>? ]*
-	</pre>
-
-	<pre class=propdef>
-	Name: masonry-template-areas
-	Value: none | <<string>>
-	Initial: none
-	Applies to: [=masonry containers=]
-	Inherited: no
-	Percentages: n/a
-	Computed Value: the keyword ''masonry-template-values/none'' or a string
-	Canonical Order: per grammar
-	Animation type: discrete
-	</pre>
-
-	'masonry-template-areas' has the same syntax and interpretation as 'grid-template-areas',
-	except it only takes a single string defining one "row" of area names.
-
-	<pre class=propdef>
-	Name: masonry-auto-tracks
-	Value: <<'grid-auto-columns'>>
-	Initial: auto
-	Applies to: grid containers
-	Inherited: no
-	Percentages: refer to corresponding dimension of the content area
-	Computed value: a [=computed track list=]
-	Canonical order: per grammar
-	Animation type:	if the list lengths match, by computed value type per item; discrete otherwise
-	</pre>
-
-	'masonry-auto-tracks' has the same syntax and interpretation as 'grid-auto-columns'.
 
 
 <h4 id=masonry-intrinsic-repeat>
@@ -754,7 +668,6 @@ Intrinsic Tracks and repeat()</h4>
 		would each result in,
 		and use those sizes.
 	</details>
-</section>
 
 <h3 id="subgrids">
 Subgrids</h3>
@@ -764,19 +677,12 @@ Subgrids</h3>
 	If the parent's corresponding axis is a [=grid axis=],
 	the subgridded axis is taken from the parent container
 	[[css-grid-2#subgrids|as specified for grid containers]];
-	if the parent's corresponding axis is a [=stacking axis=]...
-
-	<section class="option grid">
-	<span class="option grid">Grid-integrated Syntax:</span>
-	...the subgridded axis acts like ''masonry''.
+	if the parent's corresponding axis is a [=stacking axis=],
+	the subgridded axis acts like ''masonry''.
 
 	Note: If this results in ''grid-template/masonry'' in both axes,
 	it is resolved as normal for [=masonry containers=] with double-axis ''grid-template/masonry'' templates,
 	i.e. it acts like ''grid-template-columns: none; grid-template-rows: masonry''.
-	</section>
-
-	<p class="option masonry"><span class="option masonry">Grid-independent Syntax:</span>
-	...the subgridded axis acts like ''grid-template/none''.
 
 	In [=masonry layout=], auto-placed [=subgrids=]
 	don't inherit any line names from their parent grid,
@@ -1036,29 +942,14 @@ Masonry Placement</h2>
 		ISSUE: Need a better example!!!
 	</div>
 
-<section class="option grid">
 <h3 id="masonry-placement-grid-option">
-<span class="option grid">Grid-integrated Option:</span> Specifying Masonry Item Placement: the 'grid-column-*' and 'grid-row-*' properties</h3>
+Specifying Masonry Item Placement: the 'grid-column-*' and 'grid-row-*' properties</h3>
 
 	The 'grid-column-*' and 'grid-row-*' properties
 	(and their shorthands)
 	apply in the [=grid axis=] of the items
 	and establish placement just as in regular [=grid layout=].
-</section>
 
-<section class="option masonry">
-<h3 id="masonry-placement-masonry-option">
-<span class="option masonry">Grid-independent Option:</span> Specifying Masonry Item Placement: the 'masonry-track-*' properties</h3>
-
-	Item placement in the [=grid axis=] of a [=masonry container=]
-	is established with the
-	<dfn property>masonry-track-start</dfn> and
-	<dfn property>masonry-track-end</dfn> properties
-	(and their <dfn property>masonry-track</dfn> shorthand),
-	whose syntax and interpretation are analogous to the
-	'grid-column-start' and 'grid-column-end' properties
-	(and their 'grid-column' shorthand).
-</section>
 
 <h3 id="masonry-slack">
 Placement Precision: the 'masonry-slack' property</h3>