merge

Author: fantasai

css-align/Overview.bs

@@ -827,7 +827,7 @@ Baseline Self-Alignment</h3>
 		<dd>
 			A <a>grid item</a> participates in first (last) <a>baseline self-alignment</a>
 			in either its row or column (whichever matches its <a>inline axis</a>)
-			if its 'justify-self' or 'align-self' property (whichever matches its <a>inline axis</a>)
+			if its 'justify-self' or 'align-self' property (whichever affects its <a>block axis</a>)
 			computes to ''baseline'' (''last-baseline'').
 	</dl>
 

css-align/Overview.html

@@ -104,6 +104,7 @@ <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="cont
      <dd><span><a href="mailto:www-style@w3.org?subject=%5Bcss-align%5D%20YOUR%20TOPIC%20HERE">www-style@w3.org</a> with subject line “<kbd>[css-align] <var>… message topic …</var></kbd>” (<a href="http://lists.w3.org/Archives/Public/www-style/" rel="discussion">archives</a>)</span>
      <dt>Issue Tracking:
      <dd><a href="http://www.w3.org/Style/CSS/Tracker/products/39">Tracker</a>
+     <dd><a href="https://github.com/w3c/csswg-drafts/issues/">GitHub</a>
      <dd><a href="#issues-index">Inline In Spec</a>
      <dt class="editor">Editors:
      <dd class="editor p-author h-card vcard"><a class="p-name fn u-url url" href="http://fantasai.inkedblade.net/contact">Elika J. Etemad</a> (<span class="p-org org">Invited Expert</span>)
@@ -669,16 +670,14 @@ <h3 class="heading settled" data-level="3.2" id="baseline"><span class="secno">3
 	these values trigger <a data-link-type="dfn" href="#baseline-content_alignment">baseline content-alignment</a>,
 	shifting the content of the box within the box,
 	and may also affect the sizing of the box itself.
-	See <a href="#baseline-align-content">§4.1 
-Baseline Content-Alignment</a>.</p>
+	See <a href="#baseline-align-content">§4.1 Baseline Content-Alignment</a>.</p>
 
 
    <p>When specified for <a class="property" data-link-type="propdesc" href="#propdef-align-self">align-self</a>/<a class="property" data-link-type="propdesc" href="#propdef-justify-self">justify-self</a>,
 	these values trigger <a data-link-type="dfn" href="#baseline-self_alignment">baseline self-alignment</a>,
 	shifting the entire box within its container,
 	which may affect the sizing of its container.
-	See <a href="#baseline-align-self">§5.3 
-Baseline Self-Alignment</a>.</p>
+	See <a href="#baseline-align-self">§5.3 Baseline Self-Alignment</a>.</p>
 
 
    <p>If both <a data-link-type="dfn" href="#baseline-content_alignment">baseline content-alignment</a> <em>and</em> <a data-link-type="dfn" href="#baseline-self_alignment">baseline self-alignment</a> are specified in the same axis on the same box,
@@ -874,8 +873,7 @@ <h2 class="heading settled" data-level="4" id="content-distribution"><span class
 
 
    <p>Aligns the contents of the box as a whole along the box’s inline/row/main axis.
-	Values other than <dfn class="css" data-dfn-for="justify-content, align-content" data-dfn-type="value" data-export="" id="valdef-justify-content-auto">auto<a class="self-link" href="#valdef-justify-content-auto"></a></dfn> are defined in <a href="#alignment-values">§3 
-Alignment Values</a>, above.
+	Values other than <dfn class="css" data-dfn-for="justify-content, align-content" data-dfn-type="value" data-export="" id="valdef-justify-content-auto">auto<a class="self-link" href="#valdef-justify-content-auto"></a></dfn> are defined in <a href="#alignment-values">§3 Alignment Values</a>, above.
 	If both a <a class="production css" data-link-type="type" href="#typedef-content-distribution" title="Expands to: space-around | stretch | space-between | space-evenly">&lt;content-distribution></a> and <a class="production css" data-link-type="type" href="#typedef-content-position" title="Expands to: right | center | flex-start | left | flex-end | end | start">&lt;content-position></a> are given,
 	the <a class="production css" data-link-type="type" href="#typedef-content-position" title="Expands to: right | center | flex-start | left | flex-end | end | start">&lt;content-position></a> provides an explicit <a data-link-type="dfn" href="#fallback-alignment">fallback alignment</a>.</p>
 
@@ -1031,8 +1029,7 @@ <h3 class="heading settled" data-level="4.1" id="baseline-align-content"><span c
 	its <a data-link-type="dfn" href="#alignment-subject">alignment subject</a> is aligned to the start (end) edge of its <a data-link-type="dfn" href="#alignment-container">alignment container</a>
 	and the minimum necessary extra space is added between its start (end) edge and the <a data-link-type="dfn" href="#alignment-subject">alignment subject</a>
 	to match its <a data-link-type="dfn" href="#alignment-baseline">alignment baseline</a> in that axis up to that of its <a data-link-type="dfn" href="#baseline_sharing-group">baseline-sharing group</a>.
-	See <a href="#align-by-baseline">§7.3 
-Aligning Boxes by Baseline</a>.
+	See <a href="#align-by-baseline">§7.3 Aligning Boxes by Baseline</a>.
 	This increases the intrinsic size of the box.</p>
 
 
@@ -1135,8 +1132,7 @@ <h3 class="heading settled" data-level="5.1" id="justify-self-property"><span cl
 	Unless otherwise specified, this value falls back to <a class="css" data-link-type="maybe" href="#valdef-self-position-flex-start">flex-start</a>.</p>
 
 
-   <p>All other values are as defined in <a href="#alignment-values">§3 
-Alignment Values</a>, above.</p>
+   <p>All other values are as defined in <a href="#alignment-values">§3 Alignment Values</a>, above.</p>
 
 
    <hr>
@@ -1179,7 +1175,7 @@ <h3 class="heading settled" data-level="5.1" id="justify-self-property"><span cl
 
 
      <p>If either margin in this dimension is <span class="css">auto</span>,
-			or either offset property in this dimension is <span class="css">auto</span>,
+			or either offset property in this dimension is <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-position-3/#valdef-top-auto">auto</a>,
 			<a class="property" data-link-type="propdesc" href="#propdef-justify-self">justify-self</a> has no effect.
 			Otherwise, its effects are defined below.</p>
 
@@ -1290,12 +1286,10 @@ <h3 class="heading settled" data-level="5.2" id="align-self-property"><span clas
 	<a href="#alignment-values">as described by its alignment value</a>.</p>
 
 
-   <p>The <a class="css" data-link-type="maybe" href="#valdef-justify-self-auto">auto</a> and <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-flexbox-1/#valdef-align-items-stretch">stretch</a> keywords are as defined in <a href="#justify-self-property">§5.1 
-Inline/Main-Axis Alignment: the justify-self property</a>.</p>
+   <p>The <a class="css" data-link-type="maybe" href="#valdef-justify-self-auto">auto</a> and <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-flexbox-1/#valdef-align-items-stretch">stretch</a> keywords are as defined in <a href="#justify-self-property">§5.1 Inline/Main-Axis Alignment: the justify-self property</a>.</p>
 
 
-   <p>All other values are as defined in <a href="#alignment-values">§3 
-Alignment Values</a>, above.</p>
+   <p>All other values are as defined in <a href="#alignment-values">§3 Alignment Values</a>, above.</p>
 
 
    <hr>
@@ -1318,7 +1312,7 @@ <h3 class="heading settled" data-level="5.2" id="align-self-property"><span clas
 
 
      <p>When neither margin in this dimension is <span class="css">auto</span>
-			and neither offset property in this dimension is <span class="css">auto</span>,
+			and neither offset property in this dimension is <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-position-3/#valdef-top-auto">auto</a>,
 			values other than <a class="css" data-link-type="maybe" href="http://dev.w3.org/csswg/css-flexbox-1/#valdef-align-items-stretch">stretch</a> cause <a href="http://www.w3.org/TR/CSS21/visudet.html#abs-non-replaced-height">non-replaced absolutely-positioned boxes</a>
 			to use shrink-to-fit sizing for calculating <span class="css">auto</span> measures,
 			and <a class="property" data-link-type="propdesc" href="#propdef-align-self">align-self</a> dictates alignment as follows:</p>
@@ -1417,7 +1411,7 @@ <h3 class="heading settled" data-level="5.3" id="baseline-align-self"><span clas
     <dd>
 			A <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-grid-1/#grid-item">grid item</a> participates in first (last) <a data-link-type="dfn" href="#baseline-self_alignment">baseline self-alignment</a>
 			in either its row or column (whichever matches its <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-writing-modes-3/#inline-axis">inline axis</a>)
-			if its <a class="property" data-link-type="propdesc" href="#propdef-justify-self">justify-self</a> or <a class="property" data-link-type="propdesc" href="#propdef-align-self">align-self</a> property (whichever matches its <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-writing-modes-3/#inline-axis">inline axis</a>)
+			if its <a class="property" data-link-type="propdesc" href="#propdef-justify-self">justify-self</a> or <a class="property" data-link-type="propdesc" href="#propdef-align-self">align-self</a> property (whichever affects its <a data-link-type="dfn" href="http://dev.w3.org/csswg/css-writing-modes-3/#block-axis">block axis</a>)
 			computes to <a class="css" data-link-type="maybe" href="#valdef-justify-content-baseline">baseline</a> (<a class="css" data-link-type="maybe" href="#valdef-justify-content-last-baseline">last-baseline</a>).
 
    </dl>
@@ -1432,8 +1426,7 @@ <h3 class="heading settled" data-level="5.3" id="baseline-align-self"><span clas
 	its <a data-link-type="dfn" href="#alignment-subject">alignment subject</a> is aligned to the start (end) edge of its <a data-link-type="dfn" href="#alignment-container">alignment container</a>
 	and the minimum necessary extra space is added between its start (end) edge and the <a data-link-type="dfn" href="#alignment-container">alignment container</a>
 	to match its <a data-link-type="dfn" href="#alignment-baseline">alignment baseline</a> in that axis up to that of its <a data-link-type="dfn" href="#baseline_sharing-group">baseline-sharing group</a>.
-	See <a href="#align-by-baseline">§7.3 
-Aligning Boxes by Baseline</a>.
+	See <a href="#align-by-baseline">§7.3 Aligning Boxes by Baseline</a>.
 	This may increase the intrinsic size contribution of the <a data-link-type="dfn" href="#alignment-subject">alignment subject</a>.</p>
 
 
@@ -2112,6 +2105,7 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
     </ul>
    <li><a data-link-type="biblio" href="#biblio-css-position-3">[css-position-3]</a> defines the following terms:
     <ul>
+     <li><a href="http://dev.w3.org/csswg/css-position-3/#valdef-top-auto">auto</a>
      <li><a href="http://dev.w3.org/csswg/css-position-3/#propdef-bottom">bottom</a>
      <li><a href="http://dev.w3.org/csswg/css-position-3/#propdef-left">left</a>
      <li><a href="http://dev.w3.org/csswg/css-position-3/#propdef-right">right</a>
@@ -2121,7 +2115,7 @@ <h3 class="no-num heading settled" id="index-defined-elsewhere"><span class="con
     <ul>
      <li><a href="http://dev.w3.org/csswg/css-text-3/#propdef-text-align">text-align</a>
     </ul>
-   <li><a data-link-type="biblio" href="#biblio-css-values-3">[css-values-3]</a> defines the following terms:
+   <li><a data-link-type="biblio" href="#biblio-css-values-3">[css-values]</a> defines the following terms:
     <ul>
      <li><a href="http://dev.w3.org/csswg/css-values-3/#mult-opt">?</a>
      <li><a href="http://dev.w3.org/csswg/css-values-3/#comb-one">|</a>
@@ -2160,7 +2154,7 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
    <dt id="biblio-css21"><a class="self-link" href="#biblio-css21"></a>[CSS21]
    <dd>Bert Bos; et al. <a href="http://www.w3.org/TR/CSS2">Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. REC. URL: <a href="http://www.w3.org/TR/CSS2">http://www.w3.org/TR/CSS2</a>
    <dt id="biblio-svg2"><a class="self-link" href="#biblio-svg2"></a>[SVG2]
-   <dd>Nikos Andronikos; et al. <a href="http://www.w3.org/TR/SVG2/">Scalable Vector Graphics (SVG) 2</a>. 9 April 2015. WD. URL: <a href="http://www.w3.org/TR/SVG2/">http://www.w3.org/TR/SVG2/</a>
+   <dd>Nikos Andronikos; et al. <a href="http://www.w3.org/TR/SVG2/">Scalable Vector Graphics (SVG) 2</a>. 9 July 2015. WD. URL: <a href="http://www.w3.org/TR/SVG2/">http://www.w3.org/TR/SVG2/</a>
    <dt id="biblio-css-cascade-3"><a class="self-link" href="#biblio-css-cascade-3"></a>[CSS-CASCADE-3]
    <dd>Elika Etemad; Tab Atkins Jr.. <a href="http://www.w3.org/TR/css-cascade-3/">CSS Cascading and Inheritance Level 3</a>. 16 April 2015. CR. URL: <a href="http://www.w3.org/TR/css-cascade-3/">http://www.w3.org/TR/css-cascade-3/</a>
    <dt id="biblio-css-cascade-4"><a class="self-link" href="#biblio-css-cascade-4"></a>[CSS-CASCADE-4]
@@ -2181,8 +2175,8 @@ <h3 class="no-num heading settled" id="normative"><span class="content">Normativ
    <dd>CSS Positioned Layout Module Level 3 URL: <a href="http://www.w3.org/TR/css3-positioning/">http://www.w3.org/TR/css3-positioning/</a>
    <dt id="biblio-css-text-3"><a class="self-link" href="#biblio-css-text-3"></a>[CSS-TEXT-3]
    <dd>Elika Etemad; Koji Ishii. <a href="http://www.w3.org/TR/css-text-3/">CSS Text Module Level 3</a>. 10 October 2013. LCWD. URL: <a href="http://www.w3.org/TR/css-text-3/">http://www.w3.org/TR/css-text-3/</a>
-   <dt id="biblio-css-values-3"><a class="self-link" href="#biblio-css-values-3"></a>[CSS-VALUES-3]
-   <dd>CSS Values and Units Module Level 3 URL: <a href="http://www.w3.org/TR/css3-values/">http://www.w3.org/TR/css3-values/</a>
+   <dt id="biblio-css-values"><a class="self-link" href="#biblio-css-values"></a>[CSS-VALUES]
+   <dd>Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css-values/">CSS Values and Units Module Level 3</a>. 11 June 2015. CR. URL: <a href="http://www.w3.org/TR/css-values/">http://www.w3.org/TR/css-values/</a>
    <dt id="biblio-css-writing-modes-3"><a class="self-link" href="#biblio-css-writing-modes-3"></a>[CSS-WRITING-MODES-3]
    <dd>Elika Etemad; Koji Ishii. <a href="http://www.w3.org/TR/css-writing-modes-3/">CSS Writing Modes Level 3</a>. 20 March 2014. CR. URL: <a href="http://www.w3.org/TR/css-writing-modes-3/">http://www.w3.org/TR/css-writing-modes-3/</a>
    <dt id="biblio-css3-flexbox"><a class="self-link" href="#biblio-css3-flexbox"></a>[CSS3-FLEXBOX]

css-containment/Overview.bs

@@ -234,7 +234,8 @@ Paint Containment</h3>
 		the contents of the element is clipped to the element's content box,
 		including both the paint of the descendants and their geometry</span>
 	2. The element must act as a containing block for absolutely positioned and fixed positioned descendants.
-	3. The element must be a <a>formatting context</a>.
+	3. The element must be a <a>stacking context</a>.
+	4. The element must be a <a>formatting context</a>.
 
 	Possible optimizations that can be enabled by <a>paint containment</a> include (but are not limited to):
 
@@ -251,4 +252,5 @@ Paint Containment</h3>
 		so there's something to see as soon as the scroll happens,
 		rather than a frame later.)
 
-
+	3. Because they are guaranteed to be stacking contexts,
+		scrolling elements can be painted into a single GPU layer.