Skip to content

Commit aa52047

Browse files
committed
Missing s/flexbox/flex container/ <http://www.w3.org/mid/507D46CF.8050008@oupeng.com>
1 parent 1dce4d1 commit aa52047

2 files changed

Lines changed: 22 additions & 21 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111

1212
<meta content="CSS Flexible Box Layout Module" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2012-10-09 name=dcterms.issued>
14+
<meta content=2012-10-16 name=dcterms.issued>
1515
<meta content="http://dev.w3.org/csswg/css3-flexbox/" name=dcterms.creator>
1616
<meta content=W3C name=dcterms.publisher>
17-
<meta content="http://www.w3.org/TR/2012/ED-css3-flexbox-20121009/"
17+
<meta content="http://www.w3.org/TR/2012/ED-css3-flexbox-20121016/"
1818
name=dcterms.identifier>
1919
<link href="http://dev.w3.org/csswg/default.css" rel=stylesheet
2020
type="text/css">
@@ -217,11 +217,11 @@
217217

218218
<h1 id=head-box-flexible>CSS Flexible Box Layout Module</h1>
219219

220-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 9 October 2012</h2>
220+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 16 October 2012</h2>
221221

222222
<dl>
223223
<dt>This version:
224-
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20121009/">http://www.w3.org/TR/2012/CR-css3-flexbox-20121009/</a>-->
224+
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20121016/">http://www.w3.org/TR/2012/CR-css3-flexbox-20121016/</a>-->
225225

226226
<dd><a
227227
href="http://dev.w3.org/csswg/css3-flexbox/">http://dev.w3.org/csswg/css3-flexbox/</a>
@@ -1624,8 +1624,8 @@ <h3 id=flex-flow-property><span class=secno>5.3. </span> Flex Direction and
16241624
<p> Note that the ‘<a href="#flex-flow"><code
16251625
class=property>flex-flow</code></a>’ directions are <i>writing-mode</i>
16261626
sensitive. In vertical Japanese, for example, a ‘<a
1627-
href="#flex-flow-row"><code class=css>row</code></a>flexbox lays out
1628-
its contents from top to bottom, as seen in this example:
1627+
href="#flex-flow-row"><code class=css>row</code></a>flex container
1628+
lays out its contents from top to bottom, as seen in this example:
16291629

16301630
<table style="margin: 1em auto; text-align: center;">
16311631
<thead>
@@ -1853,7 +1853,7 @@ <h2 id=flex-lines><span class=secno>6. </span> Flex Lines</h2>
18531853
<p> This example shows four buttons that do not fit horizontally.
18541854

18551855
<pre>&lt;style>
1856-
#flexbox {
1856+
#flex {
18571857
display: flex;
18581858
flex-flow: row wrap;
18591859
width: 300px;
@@ -1863,7 +1863,7 @@ <h2 id=flex-lines><span class=secno>6. </span> Flex Lines</h2>
18631863
}
18641864
&lt;style>
18651865

1866-
&lt;div id="flexbox">
1866+
&lt;div id="flex">
18671867
&lt;div class='item'>1&lt;/div>
18681868
&lt;div class='item'>2&lt;/div>
18691869
&lt;div class='item'>3&lt;/div>
@@ -2364,10 +2364,11 @@ <h2 id=alignment><span class=secno>8. </span> Alignment</h2>
23642364
horizontal and vertical centering.
23652365

23662366
<p class=note> While the alignment properties are defined in the Box
2367-
Alignment spec, Flexbox reproduces the definitions of the relevant ones
2368-
here so as to not create a normative dependency that may slow down
2369-
advancement of the spec. These properties apply only to flex layout until
2370-
Box Alignment is finished and defines their effect for other layout modes.
2367+
Alignment spec, Flexible Box Layout reproduces the definitions of the
2368+
relevant ones here so as to not create a normative dependency that may
2369+
slow down advancement of the spec. These properties apply only to flex
2370+
layout until Box Alignment is finished and defines their effect for other
2371+
layout modes.
23712372

23722373
<h3 id=auto-margins><span class=secno>8.1. </span> Aligning with ‘<code
23732374
class=css>auto</code>’ margins</h3>
@@ -2463,8 +2464,8 @@ <h3 id=auto-margins><span class=secno>8.1. </span> Aligning with ‘<code
24632464
<figcaption> The items in the figure on the left are centered with
24642465
margins, while those in the figure on the right are centered with ‘<a
24652466
href="#align-self"><code class=property>align-self</code></a>’. If this
2466-
column flexbox was placed against the left edge of the page, the margin
2467-
behavior would be more desirable, as the long item would be fully
2467+
column flex container was placed against the left edge of the page, the
2468+
margin behavior would be more desirable, as the long item would be fully
24682469
readable. In other circumstances, the true centering behavior might be
24692470
better. </figcaption> </figure>
24702471
</div>
@@ -2866,7 +2867,7 @@ <h3 id=align-content-property><span class=secno>8.4. </span> Packing Flex
28662867
the <i>cross-axis</i>, similar to how ‘<a href="#justify-content"><code
28672868
class=property>justify-content</code></a>’ aligns individual items
28682869
within the <i>main-axis</i>. Note, this property has no effect when the
2869-
flexbox has only a single line. Values have the following meanings:
2870+
flex container has only a single line. Values have the following meanings:
28702871

28712872
<dl>
28722873
<dt><dfn id=align-content-flex-start><code

css3-flexbox/Overview.src.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ <h3 id='flex-flow-property'>
11691169
<p>
11701170
Note that the 'flex-flow' directions are <i>writing-mode</i> sensitive.
11711171
In vertical Japanese, for example,
1172-
a ''row'' flexbox lays out its contents from top to bottom,
1172+
a ''row'' flex container lays out its contents from top to bottom,
11731173
as seen in this example:
11741174

11751175
<table style="margin: 1em auto; text-align: center;">
@@ -1367,7 +1367,7 @@ <h2 id='flex-lines'>
13671367
This example shows four buttons that do not fit horizontally.
13681368

13691369
<pre>&lt;style>
1370-
#flexbox {
1370+
#flex {
13711371
display: flex;
13721372
flex-flow: row wrap;
13731373
width: 300px;
@@ -1377,7 +1377,7 @@ <h2 id='flex-lines'>
13771377
}
13781378
&lt;style>
13791379

1380-
&lt;div id="flexbox">
1380+
&lt;div id="flex">
13811381
&lt;div class='item'>1&lt;/div>
13821382
&lt;div class='item'>2&lt;/div>
13831383
&lt;div class='item'>3&lt;/div>
@@ -1767,7 +1767,7 @@ <h2 id='alignment'>
17671767

17681768
<p class='note'>
17691769
While the alignment properties are defined in the Box Alignment spec,
1770-
Flexbox reproduces the definitions of the relevant ones here
1770+
Flexible Box Layout reproduces the definitions of the relevant ones here
17711771
so as to not create a normative dependency that may slow down advancement of the spec.
17721772
These properties apply only to flex layout
17731773
until Box Alignment is finished
@@ -1865,7 +1865,7 @@ <h3 id='auto-margins'>
18651865
<figcaption>
18661866
The items in the figure on the left are centered with margins,
18671867
while those in the figure on the right are centered with 'align-self'.
1868-
If this column flexbox was placed against the left edge of the page,
1868+
If this column flex container was placed against the left edge of the page,
18691869
the margin behavior would be more desirable,
18701870
as the long item would be fully readable.
18711871
In other circumstances,
@@ -2146,7 +2146,7 @@ <h3 id='align-content-property'>
21462146
The 'align-content' property aligns a flex container's lines within the flex container
21472147
when there is extra space in the <i>cross-axis</i>,
21482148
similar to how 'justify-content' aligns individual items within the <i>main-axis</i>.
2149-
Note, this property has no effect when the flexbox has only a single line.
2149+
Note, this property has no effect when the flex container has only a single line.
21502150
Values have the following meanings:
21512151

21522152
<dl>

0 commit comments

Comments
 (0)