Skip to content

Commit e929dda

Browse files
bert-githubbert-github
committed
(merge)
2 parents 886749c + d485d90 commit e929dda

12 files changed

Lines changed: 356 additions & 312 deletions

File tree

‎css3-align/Overview.html‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@
1111
type="text/css">
1212

1313
<style type="text/css">
14-
body, html { max-width: none; }
14+
body, html { max-width: 85em; }
1515
.issue th:first-child { text-align: left !important; }
1616
[rowspan] > img { max-height: 4em; float: right; }
17+
[rowspan] { vertical-align: middle; }
18+
small { display: block; }
1719
</style>
1820

1921
<body>
@@ -23,11 +25,11 @@
2325

2426
<h1>CSS Box Alignment Module Level 3</h1>
2527

26-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 16 May 2012</h2>
28+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 17 May 2012</h2>
2729

2830
<dl><!--
2931
<dt>This version:
30-
<dd><a href="http://www.w3.org/TR/2012/ED-css3-align-20120516/">http://www.w3.org/TR/2012/ED-css3-align-20120516/</a>
32+
<dd><a href="http://www.w3.org/TR/2012/ED-css3-align-20120517/">http://www.w3.org/TR/2012/ED-css3-align-20120517/</a>
3133
<dt>Latest version:
3234
<dd><a href="http://www.w3.org/TR/css3-align/">http://www.w3.org/TR/css3-align/</a>
3335
-->
@@ -342,6 +344,7 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
342344
<td>inline
343345

344346
<td rowspan=2><img alt="" src=self-target.jpg> element within parent
347+
<small>(effectively adjusts margins)</small>
345348

346349
<td>✘
347350

@@ -373,6 +376,7 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
373376
<td>inline
374377

375378
<td rowspan=2><img alt="" src=content-target.jpg>content within element
379+
<small>(effectively adjusts padding)</small>
376380

377381
<td>‘<code class=property>flex-pack</code>’
378382

@@ -404,8 +408,8 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
404408
<td>inline
405409

406410
<td rowspan=2><img alt="" src=child-target.jpg> items inside element
407-
(controls items with ‘<code class=css>align/justify-outside:
408-
auto</code>’)
411+
<small>(controls child items’ ‘<code
412+
class=css>align/justify-outside: auto</code>’)</small>
409413

410414
<td>✘
411415

‎css3-align/Overview.src.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
<link rel="stylesheet" type="text/css"
1010
href="http://www.w3.org/StyleSheets/TR/W3C-[STATUS].css">
1111
<style type="text/css">
12-
body, html { max-width: none; }
12+
body, html { max-width: 85em; }
1313
.issue th:first-child { text-align: left !important; }
1414
[rowspan] > img { max-height: 4em; float: right; }
15+
[rowspan] { vertical-align: middle; }
16+
small { display: block; }
1517
</style>
1618
</head>
1719

@@ -165,7 +167,7 @@ <h2 id="overview">
165167
<tbody>
166168
<tr><th>'justify-outside'
167169
<td>inline
168-
<td rowspan=2><img src="self-target.jpg" alt=""> element within parent
170+
<td rowspan=2><img src="self-target.jpg" alt=""> element within parent <small>(effectively adjusts margins)</small>
169171
<td>✘
170172
<td>'grid-row-align'
171173
<td>✔
@@ -180,7 +182,7 @@ <h2 id="overview">
180182
<tbody>
181183
<tr><th>'justify-inside'
182184
<td>inline
183-
<td rowspan=2><img src="content-target.jpg" alt="">content within element
185+
<td rowspan=2><img src="content-target.jpg" alt="">content within element <small>(effectively adjusts padding)</small>
184186
<td>'flex-pack'
185187
<td>✔
186188
<td>✔
@@ -195,7 +197,7 @@ <h2 id="overview">
195197
<tbody>
196198
<tr><th>'justify-items'
197199
<td>inline
198-
<td rowspan=2><img src="child-target.jpg" alt=""> items inside element (controls items with ''align/justify-outside: auto'')
200+
<td rowspan=2><img src="child-target.jpg" alt=""> items inside element <small>(controls child items&rsquo; ''align/justify-outside: auto'')</small>
199201
<td>✘
200202
<td>✔
201203
<td>✘

‎css3-flexbox/Overview.html‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030

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

33-
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 15 May 2012</h2>
33+
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, 16 May 2012</h2>
3434

3535
<dl>
3636
<dt>This version:
37-
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120515/">http://www.w3.org/TR/2012/WD-css3-flexbox-20120515/</a>-->
37+
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-flexbox-20120516/">http://www.w3.org/TR/2012/WD-css3-flexbox-20120516/</a>-->
3838

3939

4040
<dd><a
@@ -572,10 +572,12 @@ <h2 id=flex-items><span class=secno>4. </span> Flexbox Items</h2>
572572
<li> An HTML <code>&lt;img></code>, <code>&lt;canvas></code>,
573573
<code>&lt;svg></code>, <code>&lt;math></code>, <code>&lt;audio></code>,
574574
<code>&lt;video></code>, <code>&lt;iframe></code>,
575-
<code>&lt;object></code>, or <code>&lt;embed></code> element. <span
575+
<code>&lt;object></code>, <code>&lt;embed></code>,
576+
<code>&lt;input></code>, <code>&lt;button></code>,
577+
<code>&lt;select></code>, or <code>&lt;textarea></code> element. <span
576578
class=note>Note: In other words, any element that is "intended to be" a
577579
replaced element, even if it becomes non-replaced (like an
578-
<code>&lt;img></code> that doesn't load as is replaced by its alt
580+
<code>&lt;img></code> that doesn't load and is replaced by its alt
579581
text.)</span>
580582

581583
<li> An anonymous block element wrapped around a contiguous run of

‎css3-flexbox/Overview.src.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,12 @@ <h2 id='flex-items'>
280280
<code>&lt;video></code>,
281281
<code>&lt;iframe></code>,
282282
<code>&lt;object></code>,
283-
or <code>&lt;embed></code> element.
284-
<span class='note'>Note: In other words, any element that is "intended to be" a replaced element, even if it becomes non-replaced (like an <code>&lt;img></code> that doesn't load as is replaced by its alt text.)</span>
283+
<code>&lt;embed></code>,
284+
<code>&lt;input></code>,
285+
<code>&lt;button></code>,
286+
<code>&lt;select></code>,
287+
or <code>&lt;textarea></code> element.
288+
<span class='note'>Note: In other words, any element that is "intended to be" a replaced element, even if it becomes non-replaced (like an <code>&lt;img></code> that doesn't load and is replaced by its alt text.)</span>
285289

286290
<li>
287291
An anonymous block element wrapped around a contiguous run of non-replaced inline child elements.

0 commit comments

Comments
 (0)