Skip to content

Commit d25c7e9

Browse files
committed
[css2] Removed INS/DEL as per Oslo ftf
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402161
1 parent 1d593bf commit d25c7e9

3 files changed

Lines changed: 7 additions & 16 deletions

File tree

css2/box.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'http://www.w3.org/TR/html4/strict.dtd'>
33

44
<html lang="en">
5-
<!-- $Id: box.src,v 1.44 2003-08-27 19:55:34 bbos Exp $ -->
5+
<!-- $Id: box.src,v 1.45 2003-08-27 20:08:09 bbos Exp $ -->
66
<HEAD>
77
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
88
<TITLE>Box model</TITLE>
@@ -331,7 +331,7 @@ elements.</p>
331331

332332
<p>The bottom margin of an in-flow block-level element is always
333333
adjoining to the top margin of its next in-flow block-level
334-
sibling<ins>, unless that sibling has clearance</ins>.</p>
334+
sibling, unless that sibling has clearance.</p>
335335

336336
<p>The top margin of an in-flow block-level element is adjoining to
337337
its first in-flow block-level child's top margin if the element has no

css2/sample.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: sample.src,v 2.34 2003-08-27 17:25:33 bbos Exp $ -->
3+
<!-- $Id: sample.src,v 2.35 2003-08-27 20:08:09 bbos Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Default style sheet for HTML 4.0</TITLE>
@@ -72,7 +72,7 @@ kbd, samp { font-family: monospace }
7272
pre { white-space: pre }
7373
button, textarea,
7474
input, object,
75-
select<del>, img</del> { display:inline-block; }
75+
select { display:inline-block; }
7676
big { font-size: 1.17em }
7777
small, sub, sup { font-size: .83em }
7878
sub { vertical-align: sub }

css2/visudet.src

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visudet.src,v 2.81 2003-08-27 17:58:16 bbos Exp $ -->
3+
<!-- $Id: visudet.src,v 2.82 2003-08-27 20:08:09 bbos Exp $ -->
44
<head>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<title>Visual formatting model details</title>
@@ -770,21 +770,12 @@ padding or borders:
770770
between the top of the topmost line box and the bottom of the
771771
bottommost line box.
772772
</p>
773-
<del class="current"
774-
cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0347.html">
775-
<p>If
776-
it has block-level children, the height is the distance between the
777-
top border-edge of the topmost block-level child box and the bottom
778-
border-edge of the bottommost block-level child box.
779-
</p>
780-
</del>
781-
<ins class="proposed"
782-
cite="http://lists.w3.org/Archives/Member/w3c-css-wg/2003AprJun/0347.html">If
773+
If
783774
it has block-level children, the height is the distance between the
784775
top border-edge of the topmost block-level child box that doesn't have
785776
<a href="box.html#collapsed-through">margins collapsed through it</a>
786777
and the bottom border-edge of the bottommost block-level child box
787-
that doesn't have margins collapsed through it.</ins> However, if the
778+
that doesn't have margins collapsed through it. However, if the
788779
element has a non-zero top padding and/or top border, then the content
789780
starts at the top <em>margin</em> edge of the topmost child. (The
790781
first case expresses the fact that the top and bottom margins of the

0 commit comments

Comments
 (0)