Skip to content

Commit ff168fe

Browse files
committed
Rewording the Box Model chapter.
1 parent 7006a8a commit ff168fe

2 files changed

Lines changed: 17 additions & 7 deletions

File tree

css3-flexbox/Overview.html

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,7 @@ <h2 id=box-model><span class=secno>2. </span> The Flexbox Box Model</h2>
321321

322322
<p>Similar to other layout modes such as table layout, a flexbox acts like
323323
a block when placed into elements using other layout modes. Inline
324-
flexboxes act like inline-blocks. <span class=issue>Figure out the right
325-
terms to use here.</span>
324+
flexboxes act like inline-blocks.
326325

327326
<div class=example>
328327
<p>For example, the following HTML snippet declares a flexbox with a few
@@ -377,7 +376,14 @@ <h3 id=display-flexbox><span class=secno>2.1. </span> New values for
377376
&lsquo;<a href="#flexbox"><code class=property>flexbox</code></a>&rsquo;
378377
or &lsquo;<code class=property>inline-flexbox</code>&rsquo;.
379378

380-
<p>Flexbox establishes a new block formatting context for its content.
379+
<p>The &lsquo;<a href="#flexbox"><code class=css>flexbox</code></a>&rsquo;
380+
value makes the flexbox act like a block in other layout modes. The
381+
&lsquo;<code class=css>inline-flexbox</code>&rsquo; value makes the
382+
flexbox act like an inline-block in other layout modes.
383+
384+
<p>A flexbox establishes a new block formatting context for its content.
385+
386+
<p class=issue>Figure out the right terms to use here.
381387

382388
<h3 id=flex-items><span class=secno>2.2. </span> Flexbox Items</h3>
383389

@@ -424,7 +430,7 @@ <h3 id=flex-items><span class=secno>2.2. </span> Flexbox Items</h3>
424430
&lt;/span>
425431

426432
&lt;!-- flexbox item: block-level replaced element -->
427-
&lt;img id="item7">
433+
&lt;iframe id="item7">
428434

429435
&lt;!-- flexbox item: inline-level replaced element -->
430436
&lt;img id="item7" style="display:inline">

css3-flexbox/Overview.src.html

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ <h2 id='box-model'>
7373

7474
<p>In the <i>cross axis</i>, <i>flexbox items</i> can either "flex" to fill the available space or be aligned within the space with the 'flex-align' property. If a flexbox is <i>multi-line</i>, new lines are added in the <i>cross-end</i> direction, and can similarly be aligned, centered, or distributed within the flexbox with the 'flex-line-pack' property.</p>
7575

76-
<p>Similar to other layout modes such as table layout, a flexbox acts like a block when placed into elements using other layout modes. Inline flexboxes act like inline-blocks. <span class=issue>Figure out the right terms to use here.</span></p>
76+
<p>Similar to other layout modes such as table layout, a flexbox acts like a block when placed into elements using other layout modes. Inline flexboxes act like inline-blocks.</p>
7777

7878
<div class="example">
7979
<p>For example, the following HTML snippet declares a flexbox with a few children. The flexbox is horizontal, and the children's widths don't fill the flexbox's width, so the additional space is distributed between the children. The flexbox's height isn't explicitly specified, so it shrinks to the height of its tallest child and centers the other children within it:</p>
@@ -108,8 +108,12 @@ <h3 id='display-flexbox'>
108108
</table>
109109

110110
<p>You can declare that an element is a flexbox, and thus should use flexbox layout, by setting the 'display' property on the element to the value 'flexbox' or 'inline-flexbox'.</p>
111+
112+
<p>The ''flexbox'' value makes the flexbox act like a block in other layout modes. The ''inline-flexbox'' value makes the flexbox act like an inline-block in other layout modes.</p>
111113

112-
<p>Flexbox establishes a new block formatting context for its content.</p>
114+
<p>A flexbox establishes a new block formatting context for its content.</p>
115+
116+
<p class='issue'>Figure out the right terms to use here.</p>
113117

114118

115119

@@ -155,7 +159,7 @@ <h3 id='flex-items'>
155159
&lt;/span>
156160

157161
&lt;!-- flexbox item: block-level replaced element -->
158-
&lt;img id="item7">
162+
&lt;iframe id="item7"></iframe>
159163

160164
&lt;!-- flexbox item: inline-level replaced element -->
161165
&lt;img id="item7" style="display:inline">

0 commit comments

Comments
 (0)