8000 Fix bad search&replace · xfq/csswg-drafts@cb9d3ee · GitHub
Skip to content

Commit cb9d3ee

Browse files
fantasaifantasai
committed
Fix bad search&replace
--HG-- extra : rebase_source : b787d69a84ad1f5fe7f84a67ebaac684eee20040
1 parent e0f7351 commit cb9d3ee

2 files changed

Lines changed: 57 additions & 59 deletions

File tree

‎css3-align/Overview.html‎

Lines changed: 40 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525

2626
<h1>CSS Box Alignment Module Level 3</h1>
2727

28-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 23 May 2012</h2>
28+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 24 May 2012</h2>
2929

3030
<dl><!--
3131
<dt>This version:
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>
32+
<dd><a href="http://www.w3.org/TR/2012/ED-css3-align-20120524/">http://www.w3.org/TR/2012/ED-css3-align-20120524/</a>
3333
<dt>Latest version:
3434
<dd><a href="http://www.w3.org/TR/css3-align/">http://www.w3.org/TR/css3-align/</a>
3535
-->
@@ -145,8 +145,8 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
145145
<li><a href="#overview"><span class=secno>2. </span> Overview of Alignment
146146
Properties</a>
147147

148-
<li><a href="#justify-content-alignment"><span class=secno>3. </span>
149-
justify-content-Alignment: Aligning the Box within its Parent</a>
148+
<li><a href="#self-alignment"><span class=secno>3. </span> Self-Alignment:
149+
Aligning the Box within its Parent</a>
150150
<ul class=toc>
151151
<li><a href="#box-justify"><span class=secno>3.1. </span>
152152
Inline/Main-Axis Alignment: the ‘<code
@@ -162,7 +162,7 @@ <h2 class="no-num no-toc" id=contents> Table of contents</h2>
162162
<ul class=toc>
163163
<li><a href="#box-justify"><span class=secno>4.1. </span>
164164
Inline/Main-Axis Alignment: the ‘<code
165-
class=property>justify-inside</code>’ property</a>
165+
class=property>justify-content</code>’ property</a>
166166

167167
<li><a href="#box-align"><span class=secno>4.2. </span>
168168
Stacking/Cross-Axis Alignment: the ‘<code
@@ -295,7 +295,7 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
295295
<li>which dimension they apply to (inline vs. stacking), and
296296

297297
<li>whether they control the position of the box within its parent, or the
298-
box's content within itjustify-content.
298+
box's content within itself.
299299
</ul>
300300

301301
<p class=note>This proposal uses the terms ‘<code
@@ -338,13 +338,13 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
338338

339339
<tbody>
340340
<tr>
341-
<th>‘<a href="#justify-justify-content"><code
342-
class=property>justify-justify-content</code></a>’
341+
<th>‘<a href="#justify-self"><code
342+
class=property>justify-self</code></a>’
343343

344344
<td>inline
345345

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

349349
<td>✘
350350

@@ -370,8 +370,8 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
370370

371371
<tbody>
372372
<tr>
373-
<th>‘<a href="#justify-inside"><code
374-
class=property>justify-inside</code></a>’
373+
<th>‘<a href="#justify-content"><code
374+
class=property>justify-content</code></a>’
375375

376376
<td>inline
377377

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

410410
<td rowspan=2><img alt="" src=child-target.jpg> items inside element
411-
<small>(controls child items’ ‘<code
412-
class=css>align/justify-justify-content: auto</code>’)</small>
411+
<small>(controls child items’ ‘<code class=css>align/justify-self:
412+
auto</code>’)</small>
413413

414414
<td>✘
415415

@@ -443,21 +443,20 @@ <h2 id=overview><span class=secno>2. </span> Overview of Alignment
443443

444444
<p class=note> The ‘<code class=property>-items</code>’ values exist
445445
due to ‘<code class=property>flex-align</code>’. They don't affect the
446-
element itjustify-content. When set on a flex container or grid container,
447-
they specify the interpretation of any ‘<code
448-
class=css>align/justify-justify-content: auto</code>’ used on the items
449-
in the container element.
446+
element itself. When set on a flex container or grid container, they
447+
specify the interpretation of any ‘<code class=css>align/justify-self:
448+
auto</code>’ used on the items in the container element.
450449

451-
<h2 id=justify-content-alignment><span class=secno>3. </span>
452-
justify-content-Alignment: Aligning the Box within its Parent</h2>
450+
<h2 id=self-alignment><span class=secno>3. </span> Self-Alignment: Aligning
451+
the Box within its Parent</h2>
453452

454-
<p>The ‘<a href="#justify-justify-content"><code
455-
class=property>justify-justify-content</code></a>’ and ‘<a
453+
<p>The ‘<a href="#justify-self"><code
454+
class=property>justify-self</code></a>’ and ‘<a
456455
href="#align-self"><code class=property>align-self</code></a>’
457456
properties control alignment of the box within its parent.
458457

459458
<div class=figure>
460-
<p><img src=justify-content-target.jpg>
459+
<p><img src=self-target.jpg>
461460
</div>
462461

463462
<h3 id=box-justify><span class=secno>3.1. </span> Inline/Main-Axis
@@ -468,7 +467,7 @@ <h3 id=box-justify><span class=secno>3.1. </span> Inline/Main-Axis
468467
<tr>
469468
<th>Name:
470469

471-
<td><dfn id=justify-justify-content>justify-justify-content</dfn>
470+
<td><dfn id=justify-self>justify-self</dfn>
472471

473472
<tr>
474473
<th><a href="#values">Value</a>:
@@ -524,9 +523,10 @@ <h3 id=box-justify><span class=secno>3.1. </span> Inline/Main-Axis
524523
<dt><dfn id=auto>‘<code class=css>auto</code>’</dfn>
525524

526525
<dd>For block-level elements, use alignment specified by the ‘<a
527-
href="#justify-inside"><code class=property>justify-inside</code></a>’
528-
property of the containing block. For grid items, indicates that the
529-
element should stretch to fill its slot.
526+ 1232
href="#justify-content"><code
527+
class=property>justify-content</code></a>’ property of the containing
528+
block. For grid items, indicates that the element should stretch to fill
529+
its slot.
530530

531531
<dt><dfn id=start>‘<code class=css>start</code>’</dfn>
532532

@@ -683,8 +683,8 @@ <h3 id=box-align><span class=secno>3.2. </span> Stacking/Cross-Axis
683683
<h2 id=content-alignment><span class=secno>4. </span> Content-Alignment:
684684
Aligning the Content within the Box</h2>
685685

686-
<p>The ‘<a href="#justify-inside"><code
687-
class=property>justify-inside</code></a>’ and ‘<a
686+
<p>The ‘<a href="#justify-content"><code
687+
class=property>justify-content</code></a>’ and ‘<a
688688
href="#align-content"><code class=property>align-content</code></a>’
689689
properties control alignment of the box's content within the box.
690690

@@ -693,15 +693,15 @@ <h2 id=content-alignment><span class=secno>4. </span> Content-Alignment:
693693
</div>
694694

695695
<h3 id=box-justify><span class=secno>4.1. </span> Inline/Main-Axis
696-
Alignment: the ‘<a href="#justify-inside"><code
697-
class=property>justify-inside</code></a>’ property</h3>
696+
Alignment: the ‘<a href="#justify-content"><code
697+
class=property>justify-content</code></a>’ property</h3>
698698

699699
<table class=propdef>
700700
<tbody>
701701
<tr>
702702
<th>Name:
703703

704-
<td><dfn id=justify-inside>justify-inside</dfn>
704+
<td><dfn id=justify-content>justify-content</dfn>
705705

706706
<tr>
707707
<th><a href="#values">Value</a>:
@@ -1043,9 +1043,8 @@ <h3 id=child-justify><span class=secno>5.1. </span> Inline/Main-Axis
10431043
grammar</abbr>
10441044
</table>
10451045

1046-
<p>Sets the default ‘<a href="#justify-justify-content"><code
1047-
class=property>justify-justify-content</code></a>’ of the grid
1048-
container's items.
1046+
<p>Sets the default ‘<a href="#justify-self"><code
1047+
class=property>justify-self</code></a>’ of the grid container's items.
10491048

10501049
<h3 id=child-align><span class=secno>5.2. </span> Stacking/Cross-Axis
10511050
Alignment: the ‘<a href="#align-items"><code
@@ -1411,14 +1410,14 @@ <h2 class=no-num id=index> Index</h2>
14111410
title="''end''"><strong>3.1.</strong></a>, <a href="#end0"
14121411
title="''end''"><strong>4.1.</strong></a>
14131412

1414-
<li>justify-inside, <a href="#justify-inside"
1415-
title=justify-inside><strong>4.1.</strong></a>
1413+
<li>justify-content, <a href="#justify-content"
1414+
title=justify-content><strong>4.1.</strong></a>
14161415

14171416
<li>justify-items, <a href="#justify-items"
14181417
title=justify-items><strong>5.1.</strong></a>
14191418

1420-
<li>justify-justify-content, <a href="#justify-justify-content"
1421-
title=justify-justify-content><strong>3.1.</strong></a>
1419+
<li>justify-self, <a href="#justify-self"
1420+
title=justify-self><strong>3.1.</strong></a>
14221421

14231422
<li>‘<a href="#left"><code class=css>left</code></a>’, <a href="#left"
14241423
title="''left''"><strong>4.1.</strong></a>
@@ -1529,7 +1528,7 @@ <h2 class=no-num id=property-index> Property index</h2>
15291528
<td>visual
15301529

15311530
<tr>
1532-
<th><a class=property href="#justify-inside">justify-inside</a>
1531+
<th><a class=property href="#justify-content">justify-content</a>
15331532

15341533
<td>auto | [ start | end | left | right | center | space-between |
15351534
space-around ] && true?
@@ -1560,8 +1559,7 @@ <h2 class=no-num id=property-index> Property index</h2>
15601559
<td>visual
15611560

15621561
<tr>
1563-
<th><a class=property
1564-
href="#justify-justify-content">justify-justify-content</a>
1562+
<th><a class=property href="#justify-self">justify-self</a>
15651563

15661564
<td>auto | [ start | center | end ] && true?
15671565

‎css3-align/Overview.src.html‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ <h2 id="overview">
137137
<ul>
138138
<li>which dimension they apply to (inline vs. stacking), and
139139
<li>whether they control the position of the box within its parent,
140-
or the box's content within itjustify-content.
140+
or the box's content within itself.
141141
</ul>
142142

143143
<p class=note>This proposal uses the terms 'justify' and 'align' to distinguish
@@ -165,9 +165,9 @@ <h2 id="overview">
165165
<th>Cell
166166
</thead>
167167
<tbody>
168-
<tr><th>'justify-justify-content'
168+
<tr><th>'justify-self'
169169
<td>inline
170-
<td rowspan=2><img src="justify-content-target.jpg" alt=""> element within parent <small>(effectively adjusts margins)</small>
170+
<td rowspan=2><img src="self-target.jpg" alt=""> element within parent <small>(effectively adjusts margins)</small>
171171
<td>✘
172172
<td>'grid-row-align'
173173
<td>✔
@@ -180,7 +180,7 @@ <h2 id="overview">
180180
<td>✘
181181
</tbody>
182182
<tbody>
183-
<tr><th>'justify-inside'
183+
<tr><th>'justify-content'
184184
<td>inline
185185
<td rowspan=2><img src="content-target.jpg" alt="">content within element <small>(effectively adjusts padding)</small>
186186
<td>'flex-pack'
@@ -197,7 +197,7 @@ <h2 id="overview">
197197
<tbody>
198198
<tr><th>'justify-items'
199199
<td>inline
200-
<td rowspan=2><img src="child-target.jpg" alt=""> items inside element <small>(controls child items&rsquo; ''align/justify-justify-content: auto'')</small>
200+
<td rowspan=2><img src="child-target.jpg" alt=""> items inside element <small>(controls child items&rsquo; ''align/justify-self: auto'')</small>
201201
<td>✘
202202
<td>✔
203203
<td>✘
@@ -216,18 +216,18 @@ <h2 id="overview">
216216

217217
<p class=note& 346 gt;
218218
The '-items' values exist due to 'flex-align'.
219-
They don't affect the element itjustify-content.
219+
They don't affect the element itself.
220220
When set on a flex container or grid container,
221-
they specify the interpretation of any ''align/justify-justify-content: auto'' used on the items in the container element.
221+
they specify the interpretation of any ''align/justify-self: auto'' used on the items in the container element.
222222

223-
<h2 id="justify-content-alignment">
224-
justify-content-Alignment: Aligning the Box within its Parent</h2>
223+
<h2 id="self-alignment">
224+
Self-Alignment: Aligning the Box within its Parent</h2>
225225

226-
<p>The 'justify-justify-content' and 'align-self' properties control alignment
226+
<p>The 'justify-self' and 'align-self' properties control alignment
227227
of the box within its parent.
228228

229229
<div class=figure>
230-
<p><img src=justify-content-target.jpg>
230+
<p><img src=self-target.jpg>
231231
</div>
232232

233233
<h3 id="box-justify">
@@ -236,7 +236,7 @@ <h3 id="box-justify">
236236
<table class=propdef>
237237
<tr>
238238
<th>Name:
239-
<td><dfn>justify-justify-content</dfn>
239+
<td><dfn>justify-self</dfn>
240240
<tr>
241241
<th><a href="#values">Value</a>:
242242
<td>auto | [ start | center | end ] && true?
@@ -270,7 +270,7 @@ <h3 id="box-justify">
270270
the box's outer edges are aligned within its containing block as described below.
271271
<dl>
272272
<dt><dfn>''auto''</dfn></dt>
273-
<dd>For block-level elements, use alignment specified by the 'justify-inside'
273+
<dd>For block-level elements, use alignment specified by the 'justify-content'
274274
property of the containing block.
275275
For grid items, indicates that the element should stretch to fill its slot.
276276
<dt><dfn>''start''</dfn></dt>
@@ -380,20 +380,20 @@ <h3 id="box-align">
380380
<h2 id="content-alignment">
381381
Content-Alignment: Aligning the Content within the Box</h2>
382382

383-
<p>The 'justify-inside' and 'align-content' properties control alignment
383+
<p>The 'justify-content' and 'align-content' properties control alignment
384384
of the box's content within the box.
385385

386386
<div class=figure>
387387
<p><img src=content-target.jpg>
388388
</div>
389389

390390
<h3 id="box-justify">
391-
Inline/Main-Axis Alignment: the 'justify-inside' property</h3>
391+
Inline/Main-Axis Alignment: the 'justify-content' property</h3>
392392

393393
<table class=propdef>
394394
<tr>
395395
<th>Name:
396-
<td><dfn>justify-inside</dfn>
396+
<td><dfn>justify-content</dfn>
397397
<tr>
398398
<th><a href="#values">Value</a>:
399399
<td>auto | [ start | end | left | right | center | space-between | space-around ] && true?
@@ -607,7 +607,7 @@ <h3 id="child-justify">
607607
<td><abbr title="follows order of property value definition">per grammar</abbr>
608608
</table>
609609

610-
<p>Sets the default 'justify-justify-content' of the grid container's items.
610+
<p>Sets the default 'justify-self' of the grid container's items.
611611

612612
<h3 id="child-align">
613613
Stacking/Cross-Axis Alignment: the 'align-items' property</h3>

0 commit comments

Comments
 (0)