Skip to content

Commit 8e37bcb

Browse files
committed
Generated. Do not edit!
1 parent 5354fa3 commit 8e37bcb

File tree

2 files changed

+80
-93
lines changed

2 files changed

+80
-93
lines changed

css3-flexbox/Overview.html

Lines changed: 69 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616

1717
<h1 id=head-box-flexible>CSS Flexible Box Layout Module</h1>
1818

19-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 30 September 2011</h2>
19+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 24 November 2011</h2>
2020

2121
<dl>
2222
<dt>This version:
2323

24-
<dd><!-- <a href="http://www.w3.org/TR/2011/WD-css3-flexbox-20110930/">http://www.w3.org/TR/2011/WD-css3-flexbox-20110930/</a></dd> -->
24+
<dd><!-- <a href="http://www.w3.org/TR/2011/WD-css3-flexbox-20111124/">http://www.w3.org/TR/2011/WD-css3-flexbox-20111124/</a></dd> -->
2525
<a
2626
href="http://dev.w3.org/csswg/css3-flexbox/">http://dev.w3.org/csswg/css3-flexbox/</a>
2727

@@ -64,13 +64,13 @@ <h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 30 September 2011</h2>
6464
<p class=copyright><a
6565
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
6666
rel=license>Copyright</a> &copy; 2011 <a
67-
href="http://www.w3.org/"><acronym title="World Wide Web
68-
Consortium">W3C</acronym></a><sup>&reg;</sup> (<a
69-
href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute
70-
of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym
71-
title="European Research Consortium for Informatics and
72-
Mathematics">ERCIM</acronym></a>, <a
73-
href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
67+
href="http://www.w3.org/"><acronym
68+
title="World Wide Web Consortium">W3C</acronym></a><sup>&reg;</sup> (<a
69+
href="http://www.csail.mit.edu/"><acronym
70+
title="Massachusetts Institute of Technology">MIT</acronym></a>, <a
71+
href="http://www.ercim.eu/"><acronym
72+
title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
73+
<a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
7474
href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
7575
<a
7676
href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>
@@ -242,9 +242,9 @@ <h2 id=box-model><span class=secno>2. </span> The Flexbox Box Model</h2>
242242
<p>An element with &lsquo;<code class=css>display:flexbox</code>&rsquo; or
243243
&lsquo;<code class=css>display:inline-flexbox</code>&rsquo; is a <dfn
244244
id=flexbox>flexbox</dfn>. Block-level children of a flexbox, and some
245-
other types of children, are called <dfn id=flexbox-item title="flexbox
246-
item|flexbox items|flexbox item's">flexbox items</dfn> and are laid out
247-
using the flexbox box model. <span class=note>(See the <a
245+
other types of children, are called <dfn id=flexbox-item
246+
title="flexbox item|flexbox items|flexbox item's">flexbox items</dfn> and
247+
are laid out using the flexbox box model. <span class=note>(See the <a
248248
href="#flex-items">Flexbox Items</a> chapter, below, for specifics on
249249
which children are <a href="#flexbox-item"><i>flexbox items</i></a>
250250
directly and which children are instead wrapped in anonymous boxes which
@@ -334,18 +334,16 @@ <h2 id=box-model><span class=secno>2. </span> The Flexbox Box Model</h2>
334334

335335
<p>This will render approximately like the following:</p>
336336

337-
<p style="border: thin solid black; background: white; width: 500px;
338-
padding: 5px; overflow: hidden;">
339-
<button style="float: left; width: 200px; height: 40px; margin-right:
340-
50px;">Child 1<br>
341-
Another Line</button>
342-
343-
<button style="float: left; width: 100px; height: 22px; margin-top:
344-
9px;">Child 2</button>
345-
346-
<button style="float: right; width: 100px; height: 22px; margin-top:
347-
9px;">Child 3</button>
348-
</p>
337+
<p
338+
style="border: thin solid black; background: white; width: 500px; padding: 5px; overflow: hidden;">
339+
<button
340+
style="float: left; width: 200px; height: 40px; margin-right: 50px;">Child
341+
1<br>
342+
Another Line</button> <button
343+
style="float: left; width: 100px; height: 22px; margin-top: 9px;">Child
344+
2</button> <button
345+
style="float: right; width: 100px; height: 22px; margin-top: 9px;">Child
346+
3</button></p>
349347
</div>
350348

351349
<h3 id=display-flexbox><span class=secno>2.1. </span> New values for
@@ -756,14 +754,8 @@ <h3 id=flex-order><span class=secno>3.2. </span> Display Order: the
756754
order will be:</p>
757755

758756
<div style="border: medium solid green; display: inline-block;">
759-
<button>Two</button>
760-
761-
<button>Four</button>
762-
763-
<button>One</button>
764-
765-
<button>Three</button>
766-
</div>
757+
<button>Two</button> <button>Four</button> <button>One</button>
758+
<button>Three</button></div>
767759
</div>
768760

769761
<p class=issue>Add a realistic example of tab reordering.
@@ -782,10 +774,11 @@ <h3 id=flex-function><span class=secno>4.1. </span> The &lsquo;<code
782774
class=css>flex()</code>&rsquo; function</h3>
783775

784776
<p>The &lsquo;<code class=css>flex()</code>&rsquo; function is used to
785-
specify the parameters of a <dfn id=flexible-length0 title="flexible
786-
length|flexible lengths|flexible length's">flexible length</dfn>: the <dfn
787-
id=positive-flexibility title="positive flexibility">positive</dfn> and
788-
<dfn id=negative-flexibility>negative flexibility</dfn>, and the <dfn
777+
specify the parameters of a <dfn id=flexible-length0
778+
title="flexible length|flexible lengths|flexible length's">flexible
779+
length</dfn>: the <dfn id=positive-flexibility
780+
title="positive flexibility">positive</dfn> and <dfn
781+
id=negative-flexibility>negative flexibility</dfn>, and the <dfn
789782
id=preferred-size>preferred size</dfn>. The syntax of the &lsquo;<code
790783
class=css>flex()</code>&rsquo; function is:
791784

@@ -1216,14 +1209,10 @@ <h2 id=multiline><span class=secno>6. </span> Multi-line Flexbox</h2>
12161209
the line, or 300 pixels.</p>
12171210

12181211
<div style="width:300px; border:medium solid green; overflow: hidden;">
1219-
<button style="width:100px; float: left;">Elephant</button>
1220-
1221-
<button style="width:100px; float: left;">Tiger</button>
1222-
1223-
<button style="width:100px; float: left;">Antelope</button>
1224-
1225-
<button style="width:300px; float: left;">Wildebeest</button>
1226-
</div>
1212+
<button style="width:100px; float: left;">Elephant</button> <button
1213+
style="width:100px; float: left;">Tiger</button> <button
1214+
style="width:100px; float: left;">Antelope</button> <button
1215+
style="width:300px; float: left;">Wildebeest</button></div>
12271216

12281217
<p>If the box was resized, the buttons may rearrange onto different lines
12291218
as necessary.</p>
@@ -1254,14 +1243,11 @@ <h2 id=multiline><span class=secno>6. </span> Multi-line Flexbox</h2>
12541243
equally on either side.</p>
12551244

12561245
<div style="width:300px; border:medium solid green; text-align:center;">
1257-
<button style="width:90px; float: left; margin-left: 15px;">Elephant</button>
1258-
1259-
<button style="width:90px; float: left;">Tiger</button>
1260-
1261-
<button style="width:90px; float: left;">Antelope</button>
1262-
1263-
<button style="width:90px">Wildebeest</button>
1264-
</div>
1246+
<button
1247+
style="width:90px; float: left; margin-left: 15px;">Elephant</button>
1248+
<button style="width:90px; float: left;">Tiger</button> <button
1249+
style="width:90px; float: left;">Antelope</button> <button
1250+
style="width:90px">Wildebeest</button></div>
12651251
</div>
12661252

12671253
<h3 id=flex-line-pack><span class=secno>6.1. </span> &lsquo;<a
@@ -1625,17 +1611,17 @@ <h2 class=no-num id=index>Index</h2>
16251611
<li>column-reverse, <a href="#flex-flow-column-reverse"
16261612
title=column-reverse><strong>3.1.</strong></a>
16271613

1628-
<li>cross axis, <a href="#cross-axis" title="cross
1629-
axis"><strong>2.</strong></a>
1614+
<li>cross axis, <a href="#cross-axis"
1615+
title="cross axis"><strong>2.</strong></a>
16301616

16311617
<li>cross-end, <a href="#cross-end"
16321618
title=cross-end><strong>2.</strong></a>
16331619

1634-
<li>cross size, <a href="#cross-size" title="cross
1635-
size"><strong>2.</strong></a>
1620+
<li>cross size, <a href="#cross-size"
1621+
title="cross size"><strong>2.</strong></a>
16361622

1637-
<li>cross size property, <a href="#cross-size-property" title="cross size
1638-
property"><strong>2.</strong></a>
1623+
<li>cross size property, <a href="#cross-size-property"
1624+
title="cross size property"><strong>2.</strong></a>
16391625

16401626
<li>cross-start, <a href="#cross-start"
16411627
title=cross-start><strong>2.</strong></a>
@@ -1649,27 +1635,28 @@ <h2 class=no-num id=index>Index</h2>
16491635

16501636
<li>flexbox, <a href="#flexbox" title=flexbox><strong>2.</strong></a>
16511637

1652-
<li>flexbox item, <a href="#flexbox-item" title="flexbox
1653-
item"><strong>2.</strong></a>
1638+
<li>flexbox item, <a href="#flexbox-item"
1639+
title="flexbox item"><strong>2.</strong></a>
16541640

1655-
<li>flexbox items, <a href="#flexbox-item" title="flexbox
1656-
items"><strong>2.</strong></a>
1641+
<li>flexbox items, <a href="#flexbox-item"
1642+
title="flexbox items"><strong>2.</strong></a>
16571643

1658-
<li>flexbox item's, <a href="#flexbox-item" title="flexbox
1659-
item's"><strong>2.</strong></a>
1644+
<li>flexbox item's, <a href="#flexbox-item"
1645+
title="flexbox item's"><strong>2.</strong></a>
16601646

16611647
<li>flex-flow, <a href="#flex-flow0"
16621648
title=flex-flow><strong>3.1.</strong></a>
16631649

1664-
<li>flexible length, <a href="#flexible-length" title="flexible
1665-
length"><strong>4.</strong></a>, <a href="#flexible-length0"
1650+
<li>flexible length, <a href="#flexible-length"
1651+
title="flexible length"><strong>4.</strong></a>, <a
1652+
href="#flexible-length0"
16661653
title="flexible length"><strong>4.1.</strong></a>
16671654

1668-
<li>flexible lengths, <a href="#flexible-length0" title="flexible
1669-
lengths"><strong>4.1.</strong></a>
1655+
<li>flexible lengths, <a href="#flexible-length0"
1656+
title="flexible lengths"><strong>4.1.</strong></a>
16701657

1671-
<li>flexible length's, <a href="#flexible-length0" title="flexible
1672-
length's"><strong>4.1.</strong></a>
1658+
<li>flexible length's, <a href="#flexible-length0"
1659+
title="flexible length's"><strong>4.1.</strong></a>
16731660

16741661
<li>flex-line-pack, <a href="#flex-line-pack0"
16751662
title=flex-line-pack><strong>6.1.</strong></a>
@@ -1687,31 +1674,31 @@ <h2 class=no-num id=index>Index</h2>
16871674
title=justify><strong>6.1.</strong></a>, <a href="#flex-pack-justify"
16881675
title=justify><strong>5.1.</strong></a>
16891676

1690-
<li>main axis, <a href="#main-axis" title="main
1691-
axis"><strong>2.</strong></a>
1677+
<li>main axis, <a href="#main-axis"
1678+
title="main axis"><strong>2.</strong></a>
16921679

16931680
<li>main-end, <a href="#main-end" title=main-end><strong>2.</strong></a>
16941681

1695-
<li>main size, <a href="#main-size" title="main
1696-
size"><strong>2.</strong></a>
1682+
<li>main size, <a href="#main-size"
1683+
title="main size"><strong>2.</strong></a>
16971684

1698-
<li>main size property, <a href="#main-size-property" title="main size
1699-
property"><strong>2.</strong></a>
1685+
<li>main size property, <a href="#main-size-property"
1686+
title="main size property"><strong>2.</strong></a>
17001687

17011688
<li>main-start, <a href="#main-start"
17021689
title=main-start><strong>2.</strong></a>
17031690

17041691
<li>multi-line, <a href="#multi-line"
17051692
title=multi-line><strong>6.</strong></a>
17061693

1707-
<li>negative flexibility, <a href="#negative-flexibility" title="negative
1708-
flexibility"><strong>4.1.</strong></a>
1694+
<li>negative flexibility, <a href="#negative-flexibility"
1695+
title="negative flexibility"><strong>4.1.</strong></a>
17091696

1710-
<li>positive flexibility, <a href="#positive-flexibility" title="positive
1711-
flexibility"><strong>4.1.</strong></a>
1697+
<li>positive flexibility, <a href="#positive-flexibility"
1698+
title="positive flexibility"><strong>4.1.</strong></a>
17121699

1713-
<li>preferred size, <a href="#preferred-size" title="preferred
1714-
size"><strong>4.1.</strong></a>
1700+
<li>preferred size, <a href="#preferred-size"
1701+
title="preferred size"><strong>4.1.</strong></a>
17151702

17161703
<li>row, <a href="#flex-flow-row" title=row><strong>3.1.</strong></a>
17171704

css3-layout/Overview.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
<h1>CSS Template Layout Module</h1>
1717

1818
<h2 class="no-num no-toc" id=longstatus-date-3-august-2004>Editor's Draft
19-
5 November 2011</h2>
19+
24 November 2011</h2>
2020

2121
<dl>
2222
<dt>This version:
2323

24-
<dd><a href="http://www.w3.org/TR/2011/ED-css3-layout-20111105/">
25-
http://www.w3.org/TR/2011/ED-css3-layout-20111105</a>
24+
<dd><a href="http://www.w3.org/TR/2011/ED-css3-layout-20111124/">
25+
http://www.w3.org/TR/2011/ED-css3-layout-20111124/</a>
2626

2727
<dt>Latest version:
2828

29-
<dd><a href="http://www.w3.org/TR/css3-layout">
30-
http://www.w3.org/TR/css3-layout</a>
29+
<dd><a href="http://www.w3.org/TR/css3-layout/">
30+
http://www.w3.org/TR/css3-layout/</a>
3131

3232
<dt>Previous version:
3333

34-
<dd><a href="http://www.w3.org/TR/2009/WD-css3-layout-20090402">
35-
http://www.w3.org/TR/2009/WD-css3-layout-20090402</a>
34+
<dd><a href="http://www.w3.org/TR/2010/WD-css3-layout-20111129/">
35+
http://www.w3.org/TR/2010/WD-css3-layout-20111129/</a>
3636

3737
<dt>Editors:
3838

@@ -702,7 +702,7 @@ <h3 id=repeating-templates><span class=secno>3.1. </span>Repeating
702702
<h3 id=non-rectangular-shapes-and-wrap-arounds><span class=secno>3.2.
703703
</span>Non-rectangular shapes and wrap-arounds</h3>
704704

705-
<p>This specification allows to chain multiple slots togother to form
705+
<p>This specification allows to chain multiple slots together to form
706706
complex shapes, but each of the slots is itself still rectangular.
707707

708708
<p>Another module, <cite>CSS exclusions and shapes</cite> <a
@@ -2643,7 +2643,7 @@ <h2 class=no-num id=acknowledgments>Acknowledgments</h2>
26432643
Ian Hickson [member-only link].</a>
26442644

26452645
<p><a href="http://transcendingcss.com/support/">Andy Clarke,</a> <a
2646-
href="http://creatingsexystylesheets.com/">Jina Bolton</a> and <a
2646+
href="http://sushiandrobots.com/about">Jina Bolton</a> and <a
26472647
href="http://lawver.net/">Kevin Lawver</a> provided use cases, examples
26482648
and requirements. The analysis in the <a href="#history">History</a>
26492649
section is a slightly shortened version of work by Steve Zilles.
@@ -2798,8 +2798,8 @@ <h2 class=no-num id=references>References</h2>
27982798

27992799
<dd>Vincent Hardy. <a
28002800
href="http://dev.w3.org/csswg/css3-exclusions/"><cite>CSS Exclusions
2801-
Module.</cite></a> Proposal for a CSS module. (Retrieved 11 May 2011)
2802-
URL: <a
2801+
Module.</cite></a> Proposal for a CSS module. (Retrieved 15 November
2802+
2011) URL: <a
28032803
href="http://dev.w3.org/csswg/css3-exclusions/">http://dev.w3.org/csswg/css3-exclusions/</a>
28042804
</dd>
28052805
<!---->

0 commit comments

Comments
 (0)