Skip to content

Commit 0d77238

Browse files
committed
--HG-- extra : rebase_source : 618ae60635b549ad2b2c2d222d872c270fc0b6d9
1 parent c67ed3a commit 0d77238

3 files changed

Lines changed: 13 additions & 12 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Previous Version: http://www.w3.org/TR/2012/WD-css3-flexbox-20120322/
1515
Previous Version: http://www.w3.org/TR/2011/WD-css3-flexbox-20111129/
1616
Previous Version: http://www.w3.org/TR/2011/WD-css3-flexbox-20110322/
1717
Previous Version: http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/
18-
Abstract: The specification describes a CSS box model optimized for user interface design. In the flex layout model, the children of a flex container can be laid out in any direction, and can "flex" their sizes, either growing to fill unused space or shrinking to avoid overflowing the parent. Both horizontal and vertical alignment of the children can be easily manipulated. Nesting of these boxes (horizontal inside vertical, or vertical inside horizontal) can be used to build layouts in two dimensions.
18+
Abstract: The specification describes a CSS box model optimized for user interface design. In the flex layout model, the children of a flex container can be laid out in any direction, and can flex their sizes, either growing to fill unused space or shrinking to avoid overflowing the parent. Both horizontal and vertical alignment of the children can be easily manipulated. Nesting of these boxes (horizontal inside vertical, or vertical inside horizontal) can be used to build layouts in two dimensions.
1919
Editor: Tab Atkins Jr., Google, http://xanthir.com/contact/
2020
Editor: fantasai, Mozilla, http://fantasai.inkedblade.net/contact
2121
Editor: Rossen Atanassov, Microsoft, ratan@microsoft.com
@@ -1297,8 +1297,8 @@ Flex Lines</h2>
12971297
Flexibility</h2>
12981298

12991299
<p>
1300-
The defining aspect of flex layout is the ability to make the <i>flex items</i> "flex",
1301-
altering their width or height to fill the available space.
1300+
The defining aspect of flex layout is the ability to make the <i>flex items</i> flex,
1301+
altering their width/height to fill the available space in the <i>main dimension</i>.
13021302
This is done with the 'flex' property.
13031303
A flex container distributes free space to its items proportional to their <i>flex grow factor</i>,
13041304
or shrinks them to prevent overflow proportional to their <i>flex shrink factor</i>.
@@ -2308,8 +2308,8 @@ Cross-Axis Alignment</h3>
23082308
<li>
23092309
Otherwise,
23102310
if the <i>block-start</i> or <i>inline-start</i> margin (whichever is in the cross axis)
2311-
is <a value for=margin>auto</a>, set it to zero;
2312-
set the opposite margin so that the outer cross size of the item
2311+
is <a value for=margin>auto</a>, set it to zero.
2312+
Set the opposite margin so that the outer cross size of the item
23132313
equals the cross size of its flex line.
23142314
</ul>
23152315

css-flexbox/Overview.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class
261261
</div>
262262

263263
<h2 class="no-num no-toc no-ref heading settled heading" id=abstract><span class=content>Abstract</span></h2>
264-
<p class=p-summary data-fill-with=abstract>The specification describes a CSS box model optimized for user interface design. In the flex layout model, the children of a flex container can be laid out in any direction, and can "flex" their sizes, either growing to fill unused space or shrinking to avoid overflowing the parent. Both horizontal and vertical alignment of the children can be easily manipulated. Nesting of these boxes (horizontal inside vertical, or vertical inside horizontal) can be used to build layouts in two dimensions.
264+
<p class=p-summary data-fill-with=abstract>The specification describes a CSS box model optimized for user interface design. In the flex layout model, the children of a flex container can be laid out in any direction, and can flex their sizes, either growing to fill unused space or shrinking to avoid overflowing the parent. Both horizontal and vertical alignment of the children can be easily manipulated. Nesting of these boxes (horizontal inside vertical, or vertical inside horizontal) can be used to build layouts in two dimensions.
265265
<a href=http://www.w3.org/TR/CSS/>CSS</a> is a language for describing the rendering of structured documents
266266
(such as HTML and XML)
267267
on screen, on paper, in speech, etc.</p>
@@ -704,7 +704,7 @@ <h2 class="heading settled heading" data-level=4 id=flex-items><span class=secno
704704
is wrapped in an anonymous <a data-link-type=dfn href=#flex-item title="flex item">flex item</a>.
705705
However, an anonymous flex item that contains only
706706
<a href=http://www.w3.org/TR/CSS21/text.html#white-space-prop>white space</a>
707-
(i.e. characters that can be affected by the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-3/#white-space title=white-space>white-space</a> property)
707+
(i.e. characters that can be affected by the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-3/#propdef-white-space title=white-space>white-space</a> property)
708708
is not rendered, as if it were <span class=css data-link-type=maybe title=display:none>display:none</span>.
709709

710710
<p>
@@ -1407,8 +1407,8 @@ <h2 class="heading settled heading" data-level=7 id=flexibility><span class=secn
14071407
Flexibility</span><a class=self-link href=#flexibility></a></h2>
14081408

14091409
<p>
1410-
The defining aspect of flex layout is the ability to make the <a data-link-type=dfn href=#flex-item title="flex items">flex items</a> "flex",
1411-
altering their width or height to fill the available space.
1410+
The defining aspect of flex layout is the ability to make the <a data-link-type=dfn href=#flex-item title="flex items">flex items</a> flex,
1411+
altering their width/height to fill the available space in the <a data-link-type=dfn href=#main-dimension title="main dimension">main dimension</a>.
14121412
This is done with the <a class=property data-link-type=propdesc href=#propdef-flex title=flex>flex</a> property.
14131413
A flex container distributes free space to its items proportional to their <a data-link-type=dfn href=#flex-grow-factor title="flex grow factor">flex grow factor</a>,
14141414
or shrinks them to prevent overflow proportional to their <a data-link-type=dfn href=#flex-shrink-factor title="flex shrink factor">flex shrink factor</a>.
@@ -2339,8 +2339,8 @@ <h3 class="heading settled heading" data-level=9.6 id=cross-alignment><span clas
23392339
<li>
23402340
Otherwise,
23412341
if the <a data-link-type=dfn href=http://dev.w3.org/csswg/css-writing-modes-3/#block-start title=block-start>block-start</a> or <a data-link-type=dfn href=http://dev.w3.org/csswg/css-writing-modes-3/#inline-start title=inline-start>inline-start</a> margin (whichever is in the cross axis)
2342-
is <a class=css-code data-link-for=margin data-link-type=value title=auto>auto</a>, set it to zero;
2343-
set the opposite margin so that the outer cross size of the item
2342+
is <a class=css-code data-link-for=margin data-link-type=value title=auto>auto</a>, set it to zero.
2343+
Set the opposite margin so that the outer cross size of the item
23442344
equals the cross size of its flex line.
23452345
</ul>
23462346

@@ -3338,7 +3338,7 @@ <h3 class="heading settled heading" id=changes-2012><span class=content>
33383338
<blockquote>
33393339
<p>However, an anonymous flex item that contains only
33403340
<a href=http://www.w3.org/TR/CSS21/text.html#white-space-prop>white space</a>
3341-
<ins>(i.e. characters that can be affected by the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-3/#white-space title=white-space>white-space</a> property)</ins>
3341+
<ins>(i.e. characters that can be affected by the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-3/#propdef-white-space title=white-space>white-space</a> property)</ins>
33423342
is not rendered, as if it were <span class=css data-link-type=maybe title=display:none>display:none</span>.
33433343
</blockquote>
33443344
<li id=clarify-2012-table-anon-boxes><a class=self-link href=#clarify-2012-table-anon-boxes></a>

css-flexbox/issues-lc-20140325.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ From: Tab Atkins
107107
Comment: http://lists.w3.org/Archives/Public/www-style/2014May/0046.html
108108
Note: This was discussed earlier, see
109109
http://lists.w3.org/Archives/Public/www-style/2012Jun/0029.html
110+
Comment: http://lists.w3.org/Archives/Public/www-style/2014May/0192.html
110111
Open
111112
----
112113
Issue 14.

0 commit comments

Comments
 (0)