Skip to content

Commit 392459f

Browse files
committed
[CSS2] change to vertical-align on inline-block, as per w3c#766 (comment)
1 parent c2b7f1e commit 392459f

34 files changed

Lines changed: 208 additions & 270 deletions

css2/aural.html

Lines changed: 25 additions & 25 deletions
Large diffs are not rendered by default.

css2/box.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -237,9 +237,9 @@ <H2>8.3 <a name="margin-properties">Margin properties</a>:
237237
value type, which may take one of the following values:</p>
238238

239239
<dl>
240-
<dt><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length"><strong>&lt;length&gt;</strong></span></a>
240+
<dt><a href="" class="noxref"><span class="value-inst-length"><strong>&lt;length&gt;</strong></span></a>
241241
<dd>Specifies a fixed width.
242-
<dt><a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></a>
242+
<dt><a href="" class="noxref"><span class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></a>
243243
<dd>The percentage is calculated
244244
with respect to the <em>width</em> of the generated box's
245245
<a href="visuren.html#containing-block">containing block</a>.
@@ -515,9 +515,9 @@ <H2>8.4 <a name="padding-properties">Padding properties</a>:
515515
</a></span> value type, which may take one of the following values:</p>
516516

517517
<dl>
518-
<dt><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length"><strong>&lt;length&gt;</strong></span></a>
518+
<dt><a href="" class="noxref"><span class="value-inst-length"><strong>&lt;length&gt;</strong></span></a>
519519
<dd>Specifies a fixed width.
520-
<dt><a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></a>
520+
<dt><a href="" class="noxref"><span class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></a>
521521
<dd>The percentage is calculated with
522522
respect to the <em>width</em> of the generated box's <a
523523
href="visuren.html#containing-block">containing block</a>, even for
@@ -643,7 +643,7 @@ <H3>8.5.1 <a name="border-width-properties">Border width</A>: <a href="box.html#
643643
<dd>A medium border.
644644
<dt><strong>thick</strong>
645645
<dd>A thick border.
646-
<dt><a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length"><strong>&lt;length&gt;</strong></span></a>
646+
<dt><a href="" class="noxref"><span class="value-inst-length"><strong>&lt;length&gt;</strong></span></a>
647647
<dd>The border's thickness has an explicit value. Explicit
648648
border widths cannot be negative.
649649
</dl>
@@ -726,7 +726,7 @@ <H3>8.5.2 <A name="border-color-properties">Border color</A>:
726726
<tbody>
727727
<tr>
728728
<th>Name:
729-
<td><a name="x42"><span class="index-def" title="'border-top-color'"><dfn id="propdef-border-top-color">border-top-color</dfn></span></a>, <a name="x43"><span class="index-def" title="'border-right-color'"><dfn id="propdef-border-right-color">border-right-color</dfn></span></a>, <a name="x44"><span class="index-def" title="'border-bottom-color'"><dfn id="propdef-border-bottom-color">border-bottom-color</dfn></span></a>, <a name="x45"><span class="index-def" title="'border-left-color'"><dfn id="propdef-border-left-color">border-left-color</dfn></span></a><tr><th>Value:<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
729+
<td><a name="x42"><span class="index-def" title="'border-top-color'"><dfn id="propdef-border-top-color">border-top-color</dfn></span></a>, <a name="x43"><span class="index-def" title="'border-right-color'"><dfn id="propdef-border-right-color">border-right-color</dfn></span></a>, <a name="x44"><span class="index-def" title="'border-bottom-color'"><dfn id="propdef-border-bottom-color">border-bottom-color</dfn></span></a>, <a name="x45"><span class="index-def" title="'border-left-color'"><dfn id="propdef-border-left-color">border-left-color</dfn></span></a><tr><th>Value:<td><a href="" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
730730
<tr><th>Initial:<td>the value of the 'color' property
731731
<tr><th>Applies to:<td>all elements
732732
<tr><th>Inherited:<td>no
@@ -739,7 +739,7 @@ <H3>8.5.2 <A name="border-color-properties">Border color</A>:
739739
<tbody>
740740
<tr>
741741
<th>Name:
742-
<td><a name="x46"><span class="index-def" title="'border-color'"><dfn id="propdef-border-color">border-color</dfn></span></a><tr><th>Value:<td>[ <a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent ]{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
742+
<td><a name="x46"><span class="index-def" title="'border-color'"><dfn id="propdef-border-color">border-color</dfn></span></a><tr><th>Value:<td>[ <a href="" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent ]{1,4} | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
743743
<tr><th>Initial:<td>see individual properties
744744
<tr><th>Applies to:<td>all elements
745745
<tr><th>Inherited:<td>no
@@ -753,7 +753,7 @@ <H3>8.5.2 <A name="border-color-properties">Border color</A>:
753753
meanings:</p>
754754

755755
<dl>
756-
<dt><span class="index-inst" title="&lt;color&gt;"><a name="x47" href="syndata.html#value-def-color" class="noxref"><span
756+
<dt><span class="index-inst" title="&lt;color&gt;"><a name="x47" href="" class="noxref"><span
757757
class="value-inst-color"><strong>&lt;color&gt;</strong></span></a></span>
758758
<dd>Specifies a color value.
759759
<dt><strong>transparent</strong>

css2/changes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ <H1><a name="q0">Appendix C. Changes</a></H1>
6767
bottom margin edge or the baseline of its last line box
6868
in the normal flow, unless it has no in-flow line boxes,
6969
in which case its baseline is the baseline is the bottom
70-
margin edge.</ins>
70+
border edge.</ins>
7171
</blockquote>
7272

7373
<p>This avoids an undesirable visual difference between

css2/changes.src

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ changes and most changes to examples are not listed here.
4444
bottom margin edge or the baseline of its last line box
4545
in the normal flow, unless it has no in-flow line boxes,
4646
in which case its baseline is the baseline is the bottom
47-
margin edge.</ins>
47+
border edge.</ins>
4848
</blockquote>
4949

5050
<p>This avoids an undesirable visual difference between
@@ -55,6 +55,8 @@ changes and most changes to examples are not listed here.
5555
<!--
5656
Status: edited
5757
https://lists.w3.org/Archives/Public/www-style/2015Apr/0144.html
58+
modified by
59+
https://github.com/w3c/csswg-drafts/issues/766
5860
-->
5961

6062
</ul>

css2/colors.html

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h2>14.1 <a name="colors">Foreground color</a>: the <a href="colors.html#propdef
6363
<tbody>
6464
<tr>
6565
<th>Name:
66-
<td><a name="x0"><span class="index-def" title="'color'"><dfn id="propdef-color">color</dfn></span></a><tr><th>Value:<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
66+
<td><a name="x0"><span class="index-def" title="'color'"><dfn id="propdef-color">color</dfn></span></a><tr><th>Value:<td><a href="" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
6767
<tr><th>Initial:<td>depends on user agent
6868
<tr><th>Applies to:<td>all elements
6969
<tr><th>Inherited:<td>yes
@@ -122,19 +122,15 @@ <h2>14.2 <a name="background">The background</a></h2>
122122
for the root element.
123123
</p>
124124

125-
126-
127125
<p>However, if no boxes are generated for the element whose background
128126
would be used for the background of the canvas, then the canvas
129-
background is transparent. (in CSS&nbsp;2.2, that is the case when the
127+
background is transparent. (In CSS&nbsp;2.2, that is the case when the
130128
element or an ancestor has 'display: none'.)
131129

132130
<p>Note that, if the element has 'visibility: hidden' but not
133131
'display: none', boxes <em>are</em> generated for it and its
134132
background <em>is</em> used for the canvas.
135133

136-
137-
138134
<div class="html example"><p>
139135
According to these rules, the canvas underlying the following
140136
HTML document will have a "marble" background:
@@ -173,7 +169,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
173169
<tbody>
174170
<tr>
175171
<th>Name:
176-
<td><a name="x1"><span class="index-def" title="'background-color'"><dfn id="propdef-background-color">background-color</dfn></span></a><tr><th>Value:<td><a href="syndata.html#value-def-color" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
172+
<td><a name="x1"><span class="index-def" title="'background-color'"><dfn id="propdef-background-color">background-color</dfn></span></a><tr><th>Value:<td><a href="" class="noxref"><span class="value-inst-color">&lt;color&gt;</span></a> | transparent | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
177173
<tr><th>Initial:<td>transparent
178174
<tr><th>Applies to:<td>all elements
179175
<tr><th>Inherited:<td>no
@@ -183,7 +179,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
183179
</table>
184180

185181
<p>This property sets the background color of an element, either a
186-
<span class="index-inst" title="&lt;color&gt;"><a name="x2" href="syndata.html#value-def-color" class="noxref"><span
182+
<span class="index-inst" title="&lt;color&gt;"><a name="x2" href="" class="noxref"><span
187183
class="value-inst-color">&lt;color&gt;</span></a></span> value or the keyword
188184
'transparent', to make the underlying colors shine through.
189185
</p>
@@ -198,7 +194,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
198194
<tbody>
199195
<tr>
200196
<th>Name:
201-
<td><a name="x3"><span class="index-def" title="'background-image'"><dfn id="propdef-background-image">background-image</dfn></span></a><tr><th>Value:<td><a href="syndata.html#value-def-uri" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
197+
<td><a name="x3"><span class="index-def" title="'background-image'"><dfn id="propdef-background-image">background-image</dfn></span></a><tr><th>Value:<td><a href="" class="noxref"><span class="value-inst-uri">&lt;uri&gt;</span></a> | none | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
202198
<tr><th>Initial:<td>none
203199
<tr><th>Applies to:<td>all elements
204200
<tr><th>Inherited:<td>no
@@ -214,7 +210,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
214210
the color is visible in the transparent parts of the image).
215211
</p>
216212
<p>Values for this property are either <span class="index-inst"
217-
title="&lt;uri&gt;"><a name="x4" href="syndata.html#value-def-uri" class="noxref"><span
213+
title="&lt;uri&gt;"><a name="x4" href="" class="noxref"><span
218214
class="value-inst-uri">&lt;uri&gt;</span></a></span>, to specify the
219215
image, or 'none', when no image is used.
220216
</p>
@@ -374,16 +370,16 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
374370
<tbody>
375371
<tr>
376372
<th>Name:
377-
<td><a name="x7"><span class="index-def" title="'background-position'"><dfn id="propdef-background-position">background-position</dfn></span></a><tr><th>Value:<td>[ [ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | left | center | right ]
378-
[ <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | top | center | bottom ]? ] |
373+
<td><a name="x7"><span class="index-def" title="'background-position'"><dfn id="propdef-background-position">background-position</dfn></span></a><tr><th>Value:<td>[ [ <a href="" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | left | center | right ]
374+
[ <a href="" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | top | center | bottom ]? ] |
379375
[ [ left | center | right ] || [ top | center | bottom ] ] |
380376
<a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
381377
<tr><th>Initial:<td>0% 0%
382378
<tr><th>Applies to:<td>all elements
383379
<tr><th>Inherited:<td>no
384380
<tr><th>Percentages:<td>refer to the size of the box itself
385381
<tr><th>Media:<td><a href="media.html#visual-media-group" class="noxref">visual</a>
386-
<tr><th>Computed&nbsp;value:<td>for <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> the absolute value, otherwise a percentage
382+
<tr><th>Computed&nbsp;value:<td>for <a href="" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> the absolute value, otherwise a percentage
387383
</table>
388384

389385
<p>If a background image has been specified, this property specifies
@@ -396,7 +392,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
396392

397393

398394
<dl>
399-
<dt><span class="index-inst" title="&lt;percentage&gt;"><a name="x8" href="syndata.html#value-def-percentage" class="noxref"><span
395+
<dt><span class="index-inst" title="&lt;percentage&gt;"><a name="x8" href="" class="noxref"><span
400396
class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></a></span>
401397

402398
<dd>A percentage X aligns the point X% across (for horizontal) or
@@ -409,7 +405,7 @@ <h3>14.2.1 <a name="background-properties">Background properties</a>: <a href="c
409405
'14% 84%', the point 14% across and 84% down the image is to be
410406
placed at the point 14% across and 84% down the padding box.
411407

412-
<dt><span class="index-inst" title="&lt;length&gt;"><a name="x9" href="syndata.html#value-def-length" class="noxref"><span
408+
<dt><span class="index-inst" title="&lt;length&gt;"><a name="x9" href="" class="noxref"><span
413409
class="value-inst-length"><strong>&lt;length&gt;</strong></span></a></span>
414410

415411
<dd>A length L aligns the top left corner of the image a distance L

css2/fonts.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ <h2>15.7 <a name="font-size-props">Font size</a>: the <a href="fonts.html#propde
673673
<tbody>
674674
<tr>
675675
<th>Name:
676-
<td><a name="x9"><span class="index-def" title="'font-size'"><dfn id="propdef-font-size">font-size</dfn></span></a><tr><th>Value:<td><a href="fonts.html#value-def-absolute-size" class="noxref"><span class="value-inst-absolute-size">&lt;absolute-size&gt;</span></a> | <a href="fonts.html#value-def-relative-size" class="noxref"><span class="value-inst-relative-size">&lt;relative-size&gt;</span></a> | <a href="syndata.html#value-def-length" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="syndata.html#value-def-percentage" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
676+
<td><a name="x9"><span class="index-def" title="'font-size'"><dfn id="propdef-font-size">font-size</dfn></span></a><tr><th>Value:<td><a href="fonts.html#value-def-absolute-size" class="noxref"><span class="value-inst-absolute-size">&lt;absolute-size&gt;</span></a> | <a href="fonts.html#value-def-relative-size" class="noxref"><span class="value-inst-relative-size">&lt;relative-size&gt;</span></a> | <a href="" class="noxref"><span class="value-inst-length">&lt;length&gt;</span></a> | <a href="" class="noxref"><span class="value-inst-percentage">&lt;percentage&gt;</span></a> | <a href="cascade.html#value-def-inherit" class="noxref"><span class="value-inst-inherit">inherit</span></a>
677677
<tr><th>Initial:<td>medium
678678
<tr><th>Applies to:<td>all elements
679679
<tr><th>Inherited:<td>yes

0 commit comments

Comments
 (0)