Skip to content

Commit c179535

Browse files
committed
http://www.w3.org/blog/CSS/2012/04/12/resolutions-30/ --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%403255
1 parent f02ea31 commit c179535

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

css2/box.src

Lines changed: 11 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.87 2011-10-18 19:25:27 bbos Exp $ -->
4+
<!-- $Id: box.src,v 1.88 2012-05-15 13:59:58 bbos Exp $ -->
55
<HEAD>
66
<TITLE>Box model</TITLE>
77
<!--script src="http://www.w3c-test.org/css/harness/annotate.js#CSS21_DEV" type="text/javascript" defer></script-->
@@ -363,12 +363,16 @@ generated by elements that are not related as siblings or ancestors.
363363
first in-flow block-level child's top margin if the element has no
364364
top border, no top padding, and the child has no clearance.
365365

366-
<LI>The bottom margin of an in-flow block box with a <span
367-
class="propinst-height">'height'</span> of 'auto' and a <span
368-
class="propinst-min-height">'min-height'</span> of zero collapses
369-
with its last in-flow block-level child's bottom margin if the box
370-
has no bottom padding and no bottom border and the child's bottom
371-
margin does not collapse with a top margin that has clearance.
366+
<LI>The bottom margin of an in-flow block box with a 'height' of
367+
'auto' collapses with its last in-flow block-level child's bottom
368+
margin, if:
369+
<UL>
370+
<LI>the box has no bottom padding, and
371+
<LI>the box has no bottom border, and
372+
<LI>the child's bottom margin neither collapses with a top margin
373+
that has clearance, nor (if the box's min-height is non-zero)
374+
with the box's top margin.
375+
</UL>
372376

373377
<LI>A box's own margins collapse if the <span
374378
class="propinst-min-height">'min-height'</span> property is zero,

0 commit comments

Comments
 (0)