merge

Author: tabatkins

css-flexbox/Overview.bs

@@ -1066,12 +1066,6 @@ Display Order: the 'order' property</h3>
 		Unless otherwise specified by a future specification,
 		this property has no effect on boxes that are not <i>flex items</i>.
 
-<!--
-	<p class='note'>
-		It is expected that future layout modes like Grid Layout
-		will also use 'order' for similar purposes.
--->
-
 <h4 id="order-accessibility">
 Reordering and Accessibility</h4>
 
@@ -1083,6 +1077,7 @@ Reordering and Accessibility</h4>
 		(such as cycling through links, see e.g. 'nav-index' [[CSS3UI]] or <a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#sequential-focus-navigation-and-the-tabindex-attribute"><code>tabindex</code></a> [[HTML40]]).
 		Authors <em>must</em> use 'order' only for visual, not logical, reordering of content;
 		style sheets that use 'order' to perform logical reordering are non-conforming.
+
 	<p class='note'>
 		This is so that non-visual media and non-CSS UAs,
 		which typically present content linearly,
@@ -1737,7 +1732,11 @@ Cross-axis Alignment: the 'align-items' and 'align-self' properties</h3>
 	<p>
 		A value of <dfn value for=align-self>auto</dfn> for 'align-self'
 		computes to the value of 'align-items' on the element’s parent,
+<<<<<<< local
 		or <a value for=align-self>stretch</a> if the element has no parent.
+=======
+		or ''align-self/stretch'' if the element has no parent.
+>>>>>>> other
 		The alignments are defined as:
 
 	<dl dfn-type=value dfn-for="align-items align-self">

css-flexbox/Overview.html

@@ -1163,8 +1163,6 @@ <h3 class="heading settled heading" data-level=5.4 id=order-property><span class
 		Unless otherwise specified by a future specification,
 		this property has no effect on boxes that are not <a data-link-type=dfn href=#flex-item title="flex items">flex items</a>.
 
-
-
 <h4 class="heading settled heading" data-level=5.4.1 id=order-accessibility><span class=secno>5.4.1 </span><span class=content>
 Reordering and Accessibility</span><a class=self-link href=#order-accessibility></a></h4>
 
@@ -1176,6 +1174,7 @@ <h4 class="heading settled heading" data-level=5.4.1 id=order-accessibility><spa
 		(such as cycling through links, see e.g. <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-ui-3/#nav-index0 title=nav-index>nav-index</a> <a data-biblio-type=informative data-link-type=biblio href=#css3ui title=css3ui>[CSS3UI]</a> or <a href=http://www.whatwg.org/specs/web-apps/current-work/multipage/editing.html#sequential-focus-navigation-and-the-tabindex-attribute><code>tabindex</code></a> <a data-biblio-type=informative data-link-type=biblio href=#html40 title=html40>[HTML40]</a>).
 		Authors <em>must</em> use <a class=property data-link-type=propdesc href=#propdef-order title=order>order</a> only for visual, not logical, reordering of content;
 		style sheets that use <a class=property data-link-type=propdesc href=#propdef-order title=order>order</a> to perform logical reordering are non-conforming.
+
 	<p class=note>
 		This is so that non-visual media and non-CSS UAs,
 		which typically present content linearly,
@@ -1753,7 +1752,11 @@ <h3 class="heading settled heading" data-level=8.3 id=align-items-property><span
 	<p>
 		A value of <dfn class=css-code data-dfn-for=align-self data-dfn-type=value data-export="" id=valuedef-auto>auto<a class=self-link href=#valuedef-auto></a></dfn> for <a class=property data-link-type=propdesc href=#propdef-align-self title=align-self>align-self</a>
 		computes to the value of <a class=property data-link-type=propdesc href=#propdef-align-items title=align-items>align-items</a> on the element’s parent,
+&lt;&lt;&lt;&lt;&lt;&lt;&lt; local
 		or <a class=css-code data-link-for=align-self data-link-type=value href=#valuedef-stretch0 title=stretch>stretch</a> if the element has no parent.
+=======
+		or <a class=css data-link-for=align-self data-link-type=maybe href=#valuedef-stretch0 title=stretch>stretch</a> if the element has no parent.
+&gt;&gt;&gt;&gt;&gt;&gt;&gt; other
 		The alignments are defined as:
 
 	<dl data-dfn-for="align-items align-self" data-dfn-type=value>