- From: Tab Atkins Jr.. via cvs-syncmail <cvsmail@w3.org>
- Date: Mon, 06 Feb 2012 21:37:08 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-flexbox
In directory hutz:/tmp/cvs-serv18780
Modified Files:
Overview.html Overview.src.html
Log Message:
Cleanup of the display:flexbox section, get appropriate wording so I can remove the issue.
Index: Overview.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.html,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- Overview.html 6 Feb 2012 21:23:00 -0000 1.144
+++ Overview.html 6 Feb 2012 21:37:05 -0000 1.145
@@ -458,14 +458,13 @@
or ‘<code class=property>inline-flexbox</code>’.
<p>The ‘<a href="#flexbox"><code class=css>flexbox</code></a>’
- value makes the flexbox act like a block in other layout modes. The
- ‘<code class=css>inline-flexbox</code>’ value makes the
- flexbox act like an inline-block in other layout modes. When it is
- necessary to distinguish them, this specification will refer to the former
- kind of flexbox as <dfn id=block-flexbox
- title="block flexbox|block flexboxes">block flexboxes</dfn> and the latter
- type as <dfn id=inline-flexbox
- title="inline flexbox|inline flexboxes">inline flexboxes</dfn>.
+ value makes the flexbox a block-level element. The ‘<code
+ class=css>inline-flexbox</code>’ value makes the flexbox an
+ inline-level element. When it is necessary to distinguish them, this
+ specification will refer to the former kind of flexbox as a <dfn
+ id=block-flexbox title="block flexbox|block flexboxes">block flexbox</dfn>
+ and the latter type as an <dfn id=inline-flexbox
+ title="inline flexbox|inline flexboxes">inline flexbox</dfn>.
<p>Flexboxes use a new layout algorithm, and so some properties that were
designed with the assumption of block layout don't make sense in a flexbox
@@ -486,7 +485,7 @@
‘<code class=property>display</code>’).
<li>‘<code class=property>vertical-align</code>’ has no effect
- on a flexbox item
+ on the alignment of a flexbox item in the flexbox
</ul>
<p>If an element's specified value for ‘<code
@@ -496,14 +495,12 @@
class=property>display</code>’ must be ‘<a
href="#flexbox"><code class=css>flexbox</code></a>’.
- <p>A flexbox creates a new flexbox formatting context for its contents.
- This is similar to a block formatting context: floats must not intrude
- into the flexbox, and the flexbox's margins do not collapse with the
- margins of its contents. Additionally, all of the <a
- href="#flexbox-item"><i>flexbox items</i></a> establish new block
- formatting contexts for their contents.
-
- <p class=issue>Figure out the right terms to use here.
+ <p>A flexbox establishes a new <dfn id=flexbox-formatting-context>flexbox
+ formatting context</dfn> for its contents. This is similar to a block
+ formatting context root: floats do not intrude into the flexbox, and the
+ flexbox's margins do not collapse with the margins of its contents.
+ Additionally, each of the <a href="#flexbox-item"><i>flexbox items</i></a>
+ establish a new formatting context for its contents.
<h3 id=flex-items><span class=secno>2.2. </span> Flexbox Items</h3>
@@ -2551,6 +2548,9 @@
<li>flexbox, <a href="#flexbox" title=flexbox><strong>2.</strong></a>
+ <li>flexbox formatting context, <a href="#flexbox-formatting-context"
+ title="flexbox formatting context"><strong>2.1.</strong></a>
+
<li>flexbox item, <a href="#flexbox-item"
title="flexbox item"><strong>2.</strong></a>
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-flexbox/Overview.src.html,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- Overview.src.html 6 Feb 2012 21:23:01 -0000 1.142
+++ Overview.src.html 6 Feb 2012 21:37:06 -0000 1.143
@@ -156,7 +156,7 @@
<p>You can declare that an element is a flexbox, and thus should use flexbox layout for its contents, by setting the 'display' property on the element to the value 'flexbox' or 'inline-flexbox'.</p>
- <p>The ''flexbox'' value makes the flexbox act like a block in other layout modes. The ''inline-flexbox'' value makes the flexbox act like an inline-block in other layout modes. When it is necessary to distinguish them, this specification will refer to the former kind of flexbox as <dfn id="block-flexbox" title="block flexbox|block flexboxes">block flexboxes</dfn> and the latter type as <dfn id="inline-flexbox" title="inline flexbox|inline flexboxes">inline flexboxes</dfn>.</p>
+ <p>The ''flexbox'' value makes the flexbox a block-level element. The ''inline-flexbox'' value makes the flexbox an inline-level element. When it is necessary to distinguish them, this specification will refer to the former kind of flexbox as a <dfn id="block-flexbox" title="block flexbox|block flexboxes">block flexbox</dfn> and the latter type as an <dfn id="inline-flexbox" title="inline flexbox|inline flexboxes">inline flexbox</dfn>.</p>
<p>Flexboxes use a new layout algorithm, and so some properties that were designed with the assumption of block layout don't make sense in a flexbox context. In particular:</p>
@@ -165,15 +165,12 @@
<li>'float' and 'clear' have no effect on a flexbox item. Using 'float' on an element still causes that element's 'display' property to compute to ''block'', as normal, because that occurs before flexbox items are determined (the algorithm for wrapping children of a flexbox into <i>flexbox items</i> needs the computed value of 'display').</li>
- <li>'vertical-align' has no effect on a flexbox item</li>
+ <li>'vertical-align' has no effect on the alignment of a flexbox item in the flexbox</li>
</ul>
<p>If an element's specified value for 'display' is ''inline-flexbox'' and the element is floated or absolutely positioned, the computed value of 'display' must be ''flexbox''.</p>
- <p>A flexbox creates a new flexbox formatting context for its contents. This is similar to a block formatting context: floats must not intrude into the flexbox, and the flexbox's margins do not collapse with the margins of its contents. Additionally, all of the <i>flexbox items</i> establish new block formatting contexts for their contents.</p>
-
- <p class='issue'>Figure out the right terms to use here.</p>
-
+ <p>A flexbox establishes a new <dfn>flexbox formatting context</dfn> for its contents. This is similar to a block formatting context root: floats do not intrude into the flexbox, and the flexbox's margins do not collapse with the margins of its contents. Additionally, each of the <i>flexbox items</i> establish a new formatting context for its contents.</p>
<h3 id='flex-items'>
Received on Monday, 6 February 2012 21:37:20 UTC