Skip to content

Commit 12d1682

Browse files
committed
merge
2 parents c4b83b7 + 437b0e9 commit 12d1682

12 files changed

Lines changed: 783 additions & 671 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 211 additions & 209 deletions
Large diffs are not rendered by default.

css3-flexbox/Overview.src.html

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ <h2 id="intro">
102102
&lt;/style></pre>
103103

104104
<div class='figure'>
105-
<img src="images/toolbar-example.svg" width=400 height=140>
105+
<img src="images/toolbar-example.svg" width=400 height=140 alt>
106106
<p class='caption'>Example rendering of the above code snippet, at two different flexbox widths.</p>
107107
</div>
108108
</div>
@@ -127,7 +127,7 @@ <h2 id='box-model'>
127127
<p>Unlike block layout, which is normally biased towards laying things out vertically, and inline layout, which is normally biased toward laying things out horizontally, the flexbox layout algorithm is agnostic as to the direction the flexbox happens to be laid out in. To make it easier to talk about flexbox layout in a general way, we will define several direction-agnostic terms here to make the rest of the spec easier to read and understand.</p>
128128

129129
<div class='figure'>
130-
<img src='images/flex-direction-terms.svg' width=510 height=300>
130+
<img src='images/flex-direction-terms.svg' width=510 height=300 alt>
131131
<p class='caption'>An illustration of the various directions and sizing terms used in this specification, respectively for ''row'' and ''column'' flexboxes.</p>
132132
</div>
133133

@@ -219,7 +219,7 @@ <h2 id='flex-items'>
219219
&lt;/span>
220220

221221
&lt;!-- flexbox item: block-level replaced element -->
222-
&lt;iframe id="item7"></iframe>
222+
&lt;iframe id="item7">&lt;/iframe>
223223

224224
&lt;!-- flexbox item: inline-level replaced element -->
225225
&lt;img id="item7" style="display:inline">
@@ -449,22 +449,22 @@ <h3 id='flex-flow'>
449449
div { flex-flow: row; }
450450
/* Initial value. Main axis is
451451
inline, no wrap. */</pre>
452-
<td><img src='images/flex-flow1.svg' width=240 height=80>
452+
<td><img src='images/flex-flow1.svg' width=240 height=80 alt>
453453
<tr>
454454
<td><pre>
455455
div { flex-flow: column wrap; }
456456
/* Main axis is block-direction and lines
457457
wrap in the inline direction. For an
458458
English page, the main axis is top-to-bottom
459459
and lines wrap to the right. */</pre>
460-
<td><img src='images/flex-flow2.svg' width=170 height=200>
460+
<td><img src='images/flex-flow2.svg' width=170 height=200 alt>
461461
<tr>
462462
<td><pre>
463463
div { writing-mode: vertical-rl;
464464
flex-flow: column wrap-reverse; }
465465
/* Main axis is block direction (right to
466466
left). New lines wrap upwards. */</pre>
467-
<td><img src='images/flex-flow3.svg' width=200 height=170>
467+
<td><img src='images/flex-flow3.svg' width=200 height=170 alt>
468468
</table>
469469
</div>
470470

@@ -508,7 +508,7 @@ <h3 id='flex-order'>
508508
<div class='example'>
509509
<p>The following figure shows a simple tabbed interface, where the tab for the active pane is always in front:</p>
510510

511-
<div class='figure'><img src="images/flex-order-example.png"></div>
511+
<div class='figure'><img src="images/flex-order-example.png" alt></div>
512512

513513
<p>This could be implemented with the following CSS (showing only the flexbox-relevant code):</p>
514514

@@ -535,7 +535,7 @@ <h3 id='flex-order'>
535535
&lt;aside>...&lt;/aside>
536536
&lt;/div>
537537
&lt;footer>...&lt;/footer></pre></div>
538-
<div><img src="images/flex-order-page.svg" width=400 height=360></div>
538+
<div><img src="images/flex-order-page.svg" width=400 height=360 alt="In this page the header is at the top and the footer at the bottom, but the article is in the center, flanked by the nav on the right and the aside on the left."></div>
539539
</div>
540540

541541
<p>This layout can be easily achieved with Flexbox:</p>
@@ -688,7 +688,7 @@ <h3 id='flex-pack'>
688688
</dl>
689689

690690
<div class="figure">
691-
<img src="images/flex-pack.svg" width=504 height=270>
691+
<img src="images/flex-pack.svg" width=504 height=270 alt>
692692
<p class='caption'>An illustration of the five 'flex-pack' keywords and their effects on a flexbox with three colored items.</p>
693693
</div>
694694

@@ -780,7 +780,7 @@ <h3 id='flex-align'>
780780
</dl>
781781

782782
<div class='figure'>
783-
<img src="images/flex-align.svg" width=508 height=377>
783+
<img src="images/flex-align.svg" width=508 height=377 alt>
784784
<p class='caption'>An illustration of the five 'flex-align' keywords and their effects on a flexbox with four colored items.</p>
785785
</div>
786786

@@ -901,7 +901,7 @@ <h3 id='flex-line-pack'>
901901
<p class='note'>Note: Only <i>multi-line</i> flexboxes ever have free space in the <i>cross axis</i> for lines to be aligned in, because in a <i>single-line</i> flexbox the sole line automatically stretches to fill the space.</p>
902902

903903
<div class="figure">
904-
<img src="images/flex-line-pack-example.png" width=585 height=514>
904+
<img src="images/flex-line-pack-example.png" width=585 height=514 alt>
905905
<p class='caption'>An illustration of the 'flex-line-pack' keywords and their effects on a multi-line flexbox.</p>
906906
</div>
907907

@@ -1242,9 +1242,9 @@ <h2 id="pagination">
12421242

12431243
<p class="note">After the break, continuation of overflow items may overlap with other items and/or content after the flexbox. It is undesirable but there is no good resolution for this spacial conflict and this outcome is similar to effect of "overflow:visible" elsewhere.</p>
12441244
</li>
1245-
</li>
12461245
</ol>
12471246
</li>
1247+
12481248
<li>Breaks inside items (forced or unforced) are not allowed</li>
12491249
</ol>
12501250
</li>

0 commit comments

Comments
 (0)