8000 Fix properties being marked as inherited when they shouldn't be, plus… · w3c/csswg-drafts@013e7b3 · GitHub
Skip to content

Commit 013e7b3

Browse files
dbarondbaron
committed
Fix properties being marked as inherited when they shouldn't be, plus a typo.
1 parent e33b518 commit 013e7b3

2 files changed

Lines changed: 17 additions & 29 deletions

File tree

‎css3-flexbox/Overview.html‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
<div class=head>
1212
<h1 id=head-box-flexible>Flexible Box Layout Module</h1>
1313

14-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 10 June 2009</h2>
14+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 6 July 2009</h2>
1515

1616
<dl>
1717
<dt>This version:
1818

19-
<dd><!-- <a href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090610/">http://www.w3.org/TR/2009/WD-css3-flexbox-20090610/</a></dd> -->
19+
<dd><!-- <a href="http://www.w3.org/TR/2009/WD-css3-flexbox-20090706/">http://www.w3.org/TR/2009/WD-css3-flexbox-20090706/</a></dd> -->
2020
<a
2121
href="http://dev.w3.org/csswg/css3-flexbox/">http://dev.w3.org/csswg/css3-flexbox/</a>
2222

@@ -130,7 +130,7 @@ <h2 id=overview><span class=secno>1 </span>Overview</h2>
130130
specification) may be created by setting the <span
131131
class=property>&lsquo;<code class=property>display</code>&rsquo;</span>
132132
property. A block-level box can be specified with a value of <span
133-
class=css>&lsquo;<code class=property>box</code>&rsquo;</span> and an an
133+
class=css>&lsquo;<code class=property>box</code>&rsquo;</span> and an
134134
inline box can be specified using a value of <span
135135
class=css>inline-box</span>.
136136

@@ -262,7 +262,7 @@ <h2 id=orientation><span class=secno>2 </span>Orientation</h2>
262262
<tr valign=baseline>
263263
<td><em>Inherited:</em>&nbsp;&nbsp;
264264

265-
<td>yes
265+
<td>no
266266

267267
<tr valign=baseline>
268268
<td><em>Percentages:</em>&nbsp;&nbsp;
@@ -305,11 +305,7 @@ <h2 id=orientation><span class=secno>2 </span>Orientation</h2>
305305
</dl>
306306

307307
<p> The inline and block axes are the writing-mode dependent keywords
308-
which, in English, map to horizontal and vertical respectively. When the
309-
orientation is omitted and the box is directly contained within another
310-
box, the default orientation is inherited from the parent. If the box is
311-
not contained within another box, the orientation is &lsquo;<code
312-
class=property>inline-axis</code>&rsquo;.
308+
which, in English, map to horizontal and vertical respectively.
313309

314310
<h2 id=displayorder><span class=secno>3 </span>Display order</h2>
315311

@@ -346,7 +342,7 @@ <h2 id=displayorder><span class=secno>3 </span>Display order</h2>
346342
<tr valign=baseline>
347343
<td><em>Inherited:</em>&nbsp;&nbsp;
348344

349-
<td>yes
345+
<td>no
350346

351347
<tr valign=baseline>
352348
<td><em>Percentages:</em>&nbsp;&nbsp;
@@ -384,11 +380,6 @@ <h2 id=displayorder><span class=secno>3 </span>Display order</h2>
384380
displays its children from bottom to top.
385381
</dl>
386382

387-
<p>When the direction is omitted and the box is directly contained within
388-
another box, the default direction is inherited from the parent. If the
389-
box is not contained within another box, the direction is &lsquo;<code
390-
class=property>normal</code>&rsquo;.
391-
392383
<p> If the computed value for the box's &lsquo;<code
393384
class=property>direction</code>&rsquo; property is &lsquo;<code
394385
class=property>normal</code>&rsquo;, a child's left edge is placed next to
@@ -1407,7 +1398,9 @@ <h2 id=inlinesAndBlocks><span class=secno>8 </span>Relationship to Inlines
14071398
<h2 class=no-num id=acknowledgments><a
14081399
name=acknowledgments>Acknowledgments</a></h2>
14091400

1410-
<p>[This section will contain acknowledgments]
1401+
<p>[This section will contain further acknowledgments.]
1402+
1403+
<p>Thanks for feedback from Shinichiro Hamaji.
14111404

14121405
<h2 class=no-num id=references>References</h2>
14131406

@@ -1422,10 +1415,10 @@ <h3 class=no-num id=normative>Normative references</h3>
14221415
<dt id=CSS21>[CSS21]
14231416

14241417
<dd>Bert Bos; et al. <a
1425-
href="http://www.w3.org/TR/2009/CR-CSS21-20090423"><cite>Cascading Style
1418+
href="http://www.w3.org/TR/2009/CR-CSS2-20090423/"><cite>Cascading Style
14261419
Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a> 23 April
14271420
2009. W3C Candidate Recommendation. (Work in progress.) URL: <a
1428-
href="http://www.w3.org/TR/2009/CR-CSS21-20090423">http://www.w3.org/TR/2009/CR-CSS21-20090423</a>
1421+
href="http://www.w3.org/TR/2009/CR-CSS2-20090423/">http://www.w3.org/TR/2009/CR-CSS2-20090423/</a>
14291422
</dd>
14301423
<!---->
14311424
</dl>

‎css3-flexbox/Overview.src.html‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ <h2 id="overview">Overview</h2>
6262
In CSS, flexible boxes (often referred to only as boxes in this
6363
specification) may be created by setting the <span class="property">'display'</span>
6464
property. A block-level box can be specified with a value of <span class="css">'box'</span>
65-
and an an inline box can be specified using a value of <span class="css">inline-box</span>.
65+
and an inline box can be specified using a value of <span class="css">inline-box</span>.
6666
</p><p>
6767

6868
A block-level box placed inside a block level element is positioned and sized as if
@@ -166,7 +166,7 @@ <h2 id="orientation">Orientation</h2>
166166
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>horizontal | vertical | inline-axis | block-axis | <span class="default">inherit</span>
167167
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>inline-axis
168168
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>box elements
169-
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>yes
169+
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
170170
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>no
171171
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td>visual</a>
172172
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>specified value
@@ -199,9 +199,6 @@ <h2 id="orientation">Orientation</h2>
199199
<p>
200200
The inline and block axes are the writing-mode dependent keywords which,
201201
in English, map to horizontal and vertical respectively.
202-
When the orientation is omitted and the box is directly contained within another
203-
box, the default orientation is inherited from the parent. If the box is not
204-
contained within another box, the orientation is 'inline-axis'.
205202
</p>
206203

207204
<h2 id="displayorder">Display order</h2>
@@ -224,7 +221,7 @@ <h2 id="displayorder">Display order</h2>
224221
<tr valign=baseline><td><em>Value:</em>&nbsp;&nbsp;<td>normal | reverse | <span class="default">inherit</span>
225222
<tr valign=baseline><td><em>Initial:</em>&nbsp;&nbsp;<td>normal
226223
<tr valign=baseline><td><em>Applies to:</em>&nbsp;&nbsp;<td>box elements
227-
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>yes
224+
<tr valign=baseline><td><em>Inherited:</em>&nbsp;&nbsp;<td>no
228225
<tr valign=baseline><td><em>Percentages:</em>&nbsp;&nbsp;<td>no
229226
<tr valign=baseline><td><em>Media:</em>&nbsp;&nbsp;<td>visual</a>
230227
<tr valign=baseline><td><em>Computed&nbsp;value:</em>&nbsp;&nbsp;<td>specified value
@@ -249,10 +246,6 @@ <h2 id="displayorder">Display order</h2>
249246
its children from bottom to top.
250247
</dd></dl>
251248

252-
</p><p>When the direction is omitted and the box is directly contained within another
253-
box, the default direction is inherited from the parent. If the box is not
254-
contained within another box, the direction is 'normal'.
255-
256249
</p><p>
257250
If the computed value for the box's 'direction' property is 'normal', a
258251
child's left edge is placed next to the right edge of the previous child, or
@@ -1096,7 +1089,9 @@ <h2 id="inlinesAndBlocks">Relationship to Inlines and blocks</h2>
10961089

10971090
<h2 class="no-num" id="acknowledgments"><a name="acknowledgments">Acknowledgments</a></h2>
10981091

1099-
<p>[This section will contain acknowledgments]
1092+
<p>[This section will contain further acknowledgments.]</p>
1093+
1094+
<p>Thanks for feedback from Shinichiro Hamaji.</p>
11001095

11011096
</p><h2 class="no-num" id="references">References</h2>
11021097

0 commit comments

Comments
 (0)