Skip to content

Commit f6226ff

Browse files
bert-githubbert-github
committed
[css2] Issues 88, 89, 90
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402378
1 parent a002f75 commit f6226ff

4 files changed

Lines changed: 39 additions & 12 deletions

File tree

‎css2/box.src‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22

33
<html lang="en">
4-
<!-- $Id: box.src,v 1.61 2005-08-27 10:17:51 ihickson Exp $ -->
4+
<!-- $Id: box.src,v 1.62 2005-10-20 03:14:37 bbos Exp $ -->
55
<HEAD>
66
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
77
<TITLE>Box model</TITLE>
@@ -347,12 +347,13 @@ its first in-flow block-level child's top margin if the element has no
347347
top border, no top padding, and the child has no <a
348348
href="visuren.html#clearance">clearance.</a></p>
349349

350-
<p>The bottom margin of an in-flow block-level element with a <span
351-
class="propinst-height">'height'</span> of 'auto' and <span
352-
class="propinst-min-height">'min-height'</span> less than the
353-
element's used height is adjoining to its last in-flow block-level
354-
child's bottom margin if the element has no bottom padding or
355-
border.</p>
350+
The bottom margin of an in-flow block-level element with
351+
a <span class="propinst-height">'height'</span> of 'auto'
352+
and <span class="propinst-min-height">'min-height'</span> less than
353+
the element's used height
354+
and <span class="propinst-max-height">'max-height'</span> greater than
355+
the element's used height is adjoining to its last in-flow block-level
356+
child's bottom margin if the element has no bottom padding or border.
356357

357358
<p>An element's own margins are adjoining if the <span
358359
class="propinst-min-height">'min-height'</span> property is zero, and

‎css2/refs.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: refs.src,v 2.37 2005-10-18 06:52:08 bbos Exp $ -->
3+
<!-- $Id: refs.src,v 2.38 2005-10-20 03:14:37 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Bibliography</TITLE>
@@ -68,8 +68,8 @@ ranges.
6868
<dt><strong><a name="ref-PNG" class="normref">[PNG]</a></strong>
6969
<dd>"Portable Network Graphics (PNG) Specification (Second Edition)",
7070
David Duce, ed., 10 November 2003.<BR>
71-
Available at <a href="http://www.w3.org/pub/WWW/TR/PNG">
72-
http://www.w3.org/pub/WWW/TR/PNG</a>.
71+
Available at <a href="http://www.w3.org/TR/PNG">
72+
http://www.w3.org/TR/PNG</a>.
7373

7474
<dt><strong><a name="ref-RFC3986" class="normref">[RFC3986]</a></strong>
7575
<dd>"Uniform Resource Identifier (URI): Generic Syntax," T.

‎css2/selector.src‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01//EN'>
22
<html lang="en">
3-
<!-- $Id: selector.src,v 2.98 2005-10-18 06:52:08 bbos Exp $ -->
3+
<!-- $Id: selector.src,v 2.99 2005-10-20 03:14:37 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Selectors</title>
@@ -999,6 +999,17 @@ element around the quote, not the quote itself: like this piece of
999999
French &#8220;&agrave; l'improviste&#8221; in the middle of an English
10001000
text uses the English quotation marks. </div>
10011001

1002+
<div class=note>
1003+
<p><strong>Note</strong> the difference between [lang|=xx] and
1004+
:lang(xx). In this HTML example, only the BODY matches [lang|=fr]
1005+
(because it has a LANG attribute) but both the BODY and the P match
1006+
:lang(fr) (because both are in French).
1007+
1008+
<pre>&lt;body lang=fr>
1009+
&lt;p>Je suis fran&ccedil;ais.&lt;/p>
1010+
&lt;/body></pre>
1011+
</div>
1012+
10021013
<h2>Pseudo-elements</h2>
10031014

10041015
<h3>The <span class="index-def"

‎css2/visuren.src‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
22
<html lang="en">
3-
<!-- $Id: visuren.src,v 2.122 2005-09-13 19:16:22 bbos Exp $ -->
3+
<!-- $Id: visuren.src,v 2.123 2005-10-20 03:14:37 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model</title>
@@ -1225,6 +1225,21 @@ left/right.
12251225
<p>References to other elements in these rules refer only to other elements in the same <a href="#block-formatting">block formatting context</a> as the float.
12261226
</p>
12271227

1228+
<div class=example>
1229+
<p>This HTML fragment results in the b floating to the right.
1230+
1231+
<pre>&lt;P>a&lt;SPAN style="float: right">b&lt;/SPAN>&lt;/P></pre>
1232+
1233+
<p>If the P element's width is enough, the a and the b will be side by
1234+
side. It might look like this:
1235+
1236+
<div class=figure>
1237+
<p><img src="images/float-right.png"
1238+
alt="An a at the left side of a box and a b at the right side">
1239+
</div>
1240+
</div>
1241+
1242+
12281243
<h3><a name="flow-control">Controlling flow next to floats:</a>
12291244
the <span class="propinst-clear">'clear'</span> property</h3>
12301245

0 commit comments

Comments
 (0)