Skip to content

Commit 145bd3f

Browse files
bert-githubbert-github
committed
(merge)
2 parents 08ff993 + 2ee6a1d commit 145bd3f

21 files changed

Lines changed: 4980 additions & 3996 deletions

‎css3-align/Overview.html‎

Lines changed: 43 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 23 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-20120523/">http://www.w3.org/TR/2012/ED-css3-align-20120523/</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

@@ -602,6 +606,40 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
602606

603607
<td>align-items
604608
</table>
609+
610+
<table class=data>
611+
<caption>Inverted Self/ContentItems</caption>
612+
<col align=char charoff="|"><col align=char charoff=- span=2>
613+
<thead>
614+
<tr>
615+
<th>thing|reference
616+
617+
<th scope=col>inline
618+
619+
<th scope=col>stacking
620+
621+
<tbody>
622+
<tr>
623+
<th scope=row>box|container
624+
625+
<td>justify-self
626+
627+
<td>align-self
628+
629+
<tr>
630+
<th scope=row>contents|box
631+
632+
<td>justify-content
633+
634+
<td>align-content
635+
636+
<tr>
637+
<th scope=row>items|box
638+
639+
<td>justify-items
640+
641+
<td>align-items
642+
</table>
605643
</div>
606644

607645
<h2 id=self-alignment><span class=secno>3. </span> Self-Alignment: Aligning

‎css3-align/Overview.src.html‎

Lines changed: 23 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>✘
@@ -296,6 +298,23 @@ <h2 id="overview">
296298
<td>justify-items <td>align-items
297299
</tbody>
298300
</table>
301+
<table class=data>
302+
<caption>Inverted Self/ContentItems</caption>
303+
<col align=char charoff="|">
304+
<col align=char charoff="-" span=2>
305+
<thead>
306+
<tr><th>thing|reference
307+
<th scope=col>inline <th scope=col>stacking
308+
</thead>
309+
<tbody>
310+
<tr><th scope=row>box|container
311+
<td>justify-self <td>align-self
312+
<tr><th scope=row>contents|box
313+
<td>justify-content <td>align-content
314+
<tr><th scope=row>items|box
315+
<td>justify-items <td>align-items
316+
</tbody>
317+
</table>
299318
</div>
300319

301320
<h2 id="self-alignment">

0 commit comments

Comments
 (0)