Skip to content

Commit 251a270

Browse files
committed
[css2] Added issues 179, 216, 219, 230, 231, 199, 210, 224, 229, 232, 235,
236, 237, 240, 241, 242, 243, 246, 250, 251, 253, 255, 258, 264, 266, 267, 269, 274, 275, 276, 278, 279, 282, 283 from http://wiki.csswg.org/spec/css2.1 --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403150
1 parent 7ef2111 commit 251a270

File tree

15 files changed

+890
-180
lines changed

15 files changed

+890
-180
lines changed

css2/box.src

Lines changed: 13 additions & 12 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.83 2011-03-08 07:04:17 fantasai Exp $ -->
4+
<!-- $Id: box.src,v 1.84 2011-03-15 23:09:02 bbos Exp $ -->
55
<HEAD>
66
<TITLE>Box model</TITLE>
77
</HEAD>
@@ -51,24 +51,24 @@ href="visudet.html#Computing_heights_and_margins">height</a>
5151
of the box, which often depend on the element's <a
5252
href="conform.html#rendered-content">rendered content</a>.
5353
The four content edges define the
54-
box's <span class="index-def"><dfn>content box</dfn></span>.
54+
box's <dfn><span class="index-def">content box</span></dfn>.
5555
<dt><span class="index-def" title="padding edge"><a name="padding-edge"><strong>padding edge</strong></a></span>
5656
<dd>The padding edge surrounds the box padding. If the padding
5757
has 0 width, the padding edge is the same as the content edge.
5858
The four padding edges define the
59-
box's <span class="index-def"><dfn>padding box</dfn></span>.
59+
box's <dfn><span class="index-def">padding box</span></dfn>.
6060
<dt><span class="index-def" title="border edge"><a name="border-edge"><strong>border edge</strong></a></span>
6161
<dd>The border edge surrounds the box's border. If the border
6262
has 0 width, the border edge is the same as the padding edge.
63-
The four border edges define the box's <span class="index-def"><dfn>border
64-
box</dfn></span>.
63+
The four border edges define the box's <dfn><span class="index-def">border
64+
box</span></dfn>.
6565
<dt><span class="index-def" title="margin edge"><a name="margin-edge"><strong>margin edge</strong></a></span>
6666
or <span class="index-def" title="outer edge"><a name="outer-edge"><strong>outer
6767
edge</strong></a></span>
6868
<dd>The margin edge surrounds the box margin. If the margin
6969
has 0 width, the margin edge is the same as the border edge.
70-
The four margin edges define the box's <span class="index-def"><dfn>margin
71-
box</dfn></span>.
70+
The four margin edges define the box's <dfn><span class="index-def">margin
71+
box</span></dfn>.
7272
</dl>
7373

7474
<P>Each edge may be broken down into a top, right, bottom, and left
@@ -274,9 +274,10 @@ body {
274274

275275
<P>In CSS, the adjoining margins of two or more boxes (which might or
276276
might not be siblings) can combine to form a single margin. Margins
277-
that combine this way are said to <dfn>collapse</dfn>, and the
278-
resulting combined margin is called a <span class="index-def"
279-
title="collapsing margin"><dfn>collapsed margin</dfn></span>.
277+
that combine this way are said to <dfn><span
278+
class="index-def">collapse</span></dfn>, and the
279+
resulting combined margin is called a <dfn><span class="index-def"
280+
title="collapsing margin">collapsed margin</span></dfn>.
280281

281282
<P>Adjoining vertical margins collapse, except:
282283

@@ -385,8 +386,8 @@ margins. If there are no positive margins, the maximum of the
385386
absolute values of the adjoining margins is deducted from zero.
386387

387388
<P ID="collapsed-through">If the top and bottom margins of a box are
388-
adjoining, then it is possible for margins to <span
389-
class="index-def"><DFN>collapse through</DFN></span> it. In this case,
389+
adjoining, then it is possible for margins to <DFN><span
390+
class="index-def">collapse through</span></DFN> it. In this case,
390391
the position of the element depends on its relationship with the other
391392
elements whose margins are being collapsed.
392393

0 commit comments

Comments
 (0)