Skip to content

Commit e5348ce

Browse files
committed
fixed typos
1 parent 5bb9830 commit e5348ce

2 files changed

Lines changed: 29 additions & 29 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
<h1 id=head-box-flexible>CSS Flexible Box Layout Module</h1>
3131

32-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 29 February 2012</h2>
32+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 5 March 2012</h2>
3333

3434
<dl>
3535
<dt>This version:
36-
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120229/">http://www.w3.org/TR/2012/ED-css3-flexbox-20120229/</a>-->
36+
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120305/">http://www.w3.org/TR/2012/ED-css3-flexbox-20120305/</a>-->
3737

3838

3939
<dd><a
@@ -1555,8 +1555,8 @@ <h3 id=flex-align><span class=secno>8.2. </span> Cross Axis Alignment: the
15551555
<dd>The <a href="#flexbox-item"><i>flexbox item's</i></a> margin box is
15561556
centered in the <a href="#cross-axis"><i>cross axis</i></a> within the
15571557
line. (If the <a href="#cross-size"><i>cross size</i></a> of the flexbox
1558-
is less than than that of the <a href="#flexbox-item"><i>flexbox
1559-
item</i></a>, it will overflow equally in both directions.)
1558+
is less than that of the <a href="#flexbox-item"><i>flexbox item</i></a>,
1559+
it will overflow equally in both directions.)
15601560

15611561
<dt><dfn id=flex-align-baseline>baseline</dfn>
15621562

@@ -1634,15 +1634,15 @@ <h3 id=auto-margins><span class=secno>8.3. </span> Resolving &#39;auto&#39;
16341634
similar to auto margins in normal flow.
16351635

16361636
<ul>
1637-
<li>Through calculations of preferred sizes and flexible lenghts, auto
1637+
<li>Through calculations of preferred sizes and flexible lengths, auto
16381638
margins are considered to be zero.
16391639

16401640
<li>&nbsp;Immediately <em>before</em> pack and align steps, if there are
16411641
any auto margins on items in the direction of alignment and there is
16421642
positive free space, the free space is distributed equally to the auto
16431643
margins.
16441644

1645-
<li>If free space was distributied to auto margins, the following pack or
1645+
<li>If free space was distributed to auto margins, the following pack or
16461646
align step has no effect.
16471647
</ul>
16481648

@@ -1652,7 +1652,7 @@ <h3 id=auto-margins><span class=secno>8.3. </span> Resolving &#39;auto&#39;
16521652
<p>Note that auto margins work consistently in both dimensions, so a
16531653
simple markup like this</p>
16541654

1655-
<pre>div { display:-ms-box;
1655+
<pre>div { display:flexbox;
16561656
width:4em; height:4em; background:silver;
16571657
}
16581658
p { margin:auto; }
@@ -1857,7 +1857,7 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
18571857
<p>To lay out a flexbox and its contents, follow these steps:
18581858

18591859
<ol>
1860-
<li value=0>Generate anonymous flexbox items around runs of continguous
1860+
<li value=0>Generate anonymous flexbox items around runs of contiguous
18611861
inline content in the flexbox, as described in the <a
18621862
href="#flex-items">Flexbox Items</a> section.
18631863

@@ -1886,9 +1886,9 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
18861886
without breaking lines other than where explicit line breaks occur,
18871887
and also calculate the preferred minimum width, e.g., by trying all
18881888
possible line breaks. This module doesn&#39;t define the exact
1889-
algorith, but it is expected that the shrink-to-fit size is calculated
1890-
the same way as it is for floats, except in this case it is not
1891-
affected by available space.</p>
1889+
algorithm, but it is expected that the shrink-to-fit size is
1890+
calculated the same way as it is for floats, except in this case it is
1891+
not affected by available space.</p>
18921892

18931893
<div class=issue>
18941894
<p>TODO: define shrink-to-fit. It works differently in row/column
@@ -2022,7 +2022,7 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
20222022
flexbox line. For all other flexbox items, its final cross size is its
20232023
hypothetical cross size. If the result conflicts with
20242024
&#39;min-width&#39;, &#39;max-width&#39;, &#39;min-height&#39; or
2025-
&#39;max-height&#39;, correct the result to comply the the restrictions.
2025+
&#39;max-height&#39;, correct the result to comply the restrictions.
20262026
</ol>
20272027

20282028
<p class=issue>&lsquo;<code class=property>auto</code>&rsquo; height must
@@ -2032,7 +2032,7 @@ <h2 id=layout-algorithm><span class=secno>9. </span> Flexbox Layout
20322032
<li>Resolve &#39;auto&#39; margins on cross axis. For each flexbox item,
20332033
if its margin box cross size is smaller than cross size of its line and
20342034
it has any margins in cross direction set to &#39;auto&#39;, distribute
2035-
the difference equaly to the auto margins.
2035+
the difference equally to the auto margins.
20362036

20372037
<li>For each flexbox line, align the flexbox items per &lsquo;<a
20382038
href="#flex-item-align"><code
@@ -2150,7 +2150,7 @@ <h2 id=pagination><span class=secno>10. </span> Page breaks in flexbox</h2>
21502150
<p class=issue>"break-inside:avoid" in single-line horizontal should
21512151
probably be applied to flexbox too.</p>
21522152

2153-
<li>In column-directon single-line flexbox and all multi-line flexboxes:
2153+
<li>In column-direction single-line flexbox and all multi-line flexboxes:
21542154
<ol>
21552155
<li>Forced break before the first item is applied to the flexbox
21562156

@@ -2191,7 +2191,7 @@ <h2 id=pagination><span class=secno>10. </span> Page breaks in flexbox</h2>
21912191
flexbox.</p>
21922192

21932193
<li>Set of items that will fit on current page is determined by adding
2194-
main-axis sizes of items until total size exceeds avaialble space or a
2194+
main-axis sizes of items until total size exceeds availalble space or a
21952195
forced break is encountered.
21962196

21972197
<li>If border box of an item doesn’t fit in available space, a break
@@ -2202,7 +2202,7 @@ <h2 id=pagination><span class=secno>10. </span> Page breaks in flexbox</h2>
22022202
according to ‘flex-pack’ property, independently from the rest of
22032203
flexbox content.</p>
22042204

2205-
<p>Note that flexible lenghts are not recalculated on each page, even
2205+
<p>Note that flexible lengths are not recalculated on each page, even
22062206
if there is additional free space.</p>
22072207
</ol>
22082208

@@ -2326,7 +2326,7 @@ <h2 id=pagination><span class=secno>10. </span> Page breaks in flexbox</h2>
23262326
<li>Line packing is done on each page, with content on the page
23272327
</ol>
23282328

2329-
<p class=issue>TODO: combine breaking algorightms for multiline in both
2329+
<p class=issue>TODO: combine breaking algorigthms for multiline in both
23302330
directions. If breaks inside items are not allowed the algorithm is
23312331
almost same.</p>
23322332
</ul>

css3-flexbox/Overview.src.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@ <h3 id='flex-align'>
761761
<dd>The <i>cross-end</i> margin edge of the <i>flexbox item</i> is placed flush with the <i>cross-end</i> edge of the line.</dd>
762762

763763
<dt><dfn id="flex-align-center">center</dfn></dt>
764-
<dd>The <i>flexbox item's</i> margin box is centered in the <i>cross axis</i> within the line. (If the <i>cross size</i> of the flexbox is less than than that of the <i>flexbox item</i>, it will overflow equally in both directions.)</dd>
764+
<dd>The <i>flexbox item's</i> margin box is centered in the <i>cross axis</i> within the line. (If the <i>cross size</i> of the flexbox is less than that of the <i>flexbox item</i>, it will overflow equally in both directions.)</dd>
765765

766766
<dt><dfn id="flex-align-baseline">baseline</dfn></dt>
767767
<dd>
@@ -813,19 +813,19 @@ <h3 id='auto-margins'>
813813
Margins on flexbox items can be set to &#39;auto&#39;, with effect very similar to auto
814814
margins in normal flow. </p>
815815
<ul>
816-
<li>Through calculations of preferred sizes and flexible lenghts, auto
816+
<li>Through calculations of preferred sizes and flexible lengths, auto
817817
margins are considered to be zero.</li>
818818
<li>&nbsp;Immediately <em>before</em> pack and align steps, if there are any
819819
auto margins on items in the direction of alignment and there is positive
820820
free space, the free space is distributed equally to the auto margins. </li>
821-
<li>If free space was distributied to auto margins, the following pack or align
821+
<li>If free space was distributed to auto margins, the following pack or align
822822
step has no effect.</li>
823823
</ul>
824824
<div class="example">
825825
<p>Auto margins can be used for simple alignment or for fine control.</p>
826826
<p>Note that auto margins work consistently in both dimensions, so a simple
827827
markup like this</p>
828-
<pre>div { display:-ms-box;
828+
<pre>div { display:flexbox;
829829
width:4em; height:4em; background:silver;
830830
}
831831
p { margin:auto; }
@@ -942,7 +942,7 @@ <h2 id='layout-algorithm'>
942942
<p>To lay out a flexbox and its contents, follow these steps:</p>
943943

944944
<ol>
945-
<li value=0>Generate anonymous flexbox items around runs of continguous inline content in the flexbox, as described in the <a href="#flex-items">Flexbox Items</a> section.</li>
945+
<li value=0>Generate anonymous flexbox items around runs of contiguous inline content in the flexbox, as described in the <a href="#flex-items">Flexbox Items</a> section.</li>
946946

947947
<li>Re-order the flexbox items according to their 'flex-order'. The items with the lowest (most negative) 'flex-order' values are first in the ordering. If multiple items share a 'flex-order' value, they're ordered by document order. This affects the order in which the flexbox items generate boxes in the box-tree, and how the rest of this algorithm deals with the items.</li>
948948

@@ -955,7 +955,7 @@ <h2 id='layout-algorithm'>
955955
<li>
956956
<p>Otherwise layout the flexbox items using the shrink-to-fit algorithm.</p>
957957

958-
<p>Calculation of the shrink-to-fit width is similar to calculating the width of a table cell using the automatic table layout algorithm. Roughly: calculate the preferred width by formatting the content without breaking lines other than where explicit line breaks occur, and also calculate the preferred minimum width, e.g., by trying all possible line breaks. This module doesn&#39;t define the exact algorith, but it is expected that the shrink-to-fit size is calculated the same way as it is for floats, except in this case it is not affected by available space.</p>
958+
<p>Calculation of the shrink-to-fit width is similar to calculating the width of a table cell using the automatic table layout algorithm. Roughly: calculate the preferred width by formatting the content without breaking lines other than where explicit line breaks occur, and also calculate the preferred minimum width, e.g., by trying all possible line breaks. This module doesn&#39;t define the exact algorithm, but it is expected that the shrink-to-fit size is calculated the same way as it is for floats, except in this case it is not affected by available space.</p>
959959

960960
<div class="issue"><p>TODO: define shrink-to-fit. It works
961961
differently in row/column flexboxes:</p>
@@ -1047,13 +1047,13 @@ <h2 id='layout-algorithm'>
10471047
<li>Determine the final cross size of each flexbox item. For each flexbox item, if it has ''flex-item-align:stretch'', its final cross size is
10481048
set so that its margin-box cross size is equal to cross-size of its flexbox line. For all other flexbox items, its final cross size is its hypothetical cross size.
10491049
If the result conflicts with &#39;min-width&#39;, &#39;max-width&#39;, &#39;min-height&#39; or
1050-
&#39;max-height&#39;, correct the result to comply the the restrictions.</li>
1050+
&#39;max-height&#39;, correct the result to comply the restrictions.</li>
10511051
<p class="issue">'auto' height must only grow, not shrink here</p>
10521052

10531053
<li>Resolve &#39;auto&#39; margins on cross axis. For each flexbox item, if its
10541054
margin box cross size is smaller than cross size of its line and it has
10551055
any margins in cross direction set to &#39;auto&#39;, distribute the difference
1056-
equaly to the auto margins. </li>
1056+
equally to the auto margins. </li>
10571057
<li>For each flexbox line, align the flexbox items per 'flex-item-align'.</li>
10581058

10591059
<li>Align the flexbox lines per 'flex-line-pack'. The leftover free-space is calculated by subtracting the sum of the flexbox line's cross sizes from the cross size of the flexbox's content box.</li>
@@ -1153,7 +1153,7 @@ <h2 id="pagination">
11531153
<li>In a row-direction single-line flexbox, breaks before and after items apply to the flexbox</li>
11541154
<p class="issue">"break-inside:avoid" in single-line horizontal should probably be applied to flexbox too.</p>
11551155

1156-
<li>In column-directon single-line flexbox and all multi-line flexboxes:
1156+
<li>In column-direction single-line flexbox and all multi-line flexboxes:
11571157

11581158
<ol>
11591159
<li>Forced break before the first item is applied to the flexbox</li>
@@ -1188,14 +1188,14 @@ <h2 id="pagination">
11881188
<p>If page size varies and flexbox size depends on page size, this step has to be repeated on each page, again with the whole content of the flexbox.</p>
11891189
</li>
11901190

1191-
<li>Set of items that will fit on current page is determined by adding main-axis sizes of items until total size exceeds avaialble space or a forced break is encountered.</li>
1191+
<li>Set of items that will fit on current page is determined by adding main-axis sizes of items until total size exceeds availalble space or a forced break is encountered.</li>
11921192

11931193
<li>If border box of an item doesn’t fit in available space, a break inside the item is considered</li>
11941194

11951195
<li>
11961196
<p>Items that fit on a page completely or partially are aligned according to ‘flex-pack’ property, independently from the rest of flexbox content.</p>
11971197

1198-
<p>Note that flexible lenghts are not recalculated on each page, even if there is additional free space.</p>
1198+
<p>Note that flexible lengths are not recalculated on each page, even if there is additional free space.</p>
11991199
</li>
12001200
</ol>
12011201

@@ -1286,7 +1286,7 @@ <h2 id="pagination">
12861286
that have fit on the current page.</li>
12871287

12881288
<li>Line packing is done on each page, with content on the page</li>
1289-
<p class="issue">TODO: combine breaking algorightms for multiline in both directions. If breaks inside items are not allowed the algorithm is almost same.</p>
1289+
<p class="issue">TODO: combine breaking algorigthms for multiline in both directions. If breaks inside items are not allowed the algorithm is almost same.</p>
12901290
</ol>
12911291
</li>
12921292
</ol>

0 commit comments

Comments
 (0)