Skip to content

Commit 52364f3

Browse files
committed
[css2] changed "floated" to "floating" several placed
changed the description of 'float' so that it no longer ignores the 'display' property -- the 'none' value must be honored... --HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%40488
1 parent 5a94a5c commit 52364f3

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

css2/visuren.src

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
1+
is!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: visuren.src,v 1.44 1997-11-28 16:06:05 howcome Exp $ -->
3+
<!-- $Id: visuren.src,v 1.45 1997-12-05 14:10:14 howcome Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Visual rendering model</TITLE>
@@ -729,12 +729,12 @@ children elements: children elements always flow relative to the
729729
position of their parent (the floater or absolutely positioned
730730
element) unless positioned absolutely themselves.
731731

732-
<P>A floated box is moved to the left or right until the margin,
732+
<P>A floating box is moved to the left or right until the margin,
733733
padding, or border of another block-level element is reached.
734734

735-
<P>User agents take the boundaries of floated boxes into account when
735+
<P>User agents take the boundaries of floating boxes into account when
736736
flowing subsequent boxes, i.e., boxes that follow flow around the
737-
floated box. The margins, borders and padding of the floated box are
737+
floating box. The margins, borders and padding of the floating box are
738738
honored, and the margins never collapse with the margins of adjacent
739739
elements.
740740

@@ -747,9 +747,11 @@ property for the element generating the box.
747747
it appears in the text. With a value of 'left' ('right') the element
748748
will be moved to the left ('right') and the text will wrap on the
749749
right (left) side of the element. With a value of 'left' or 'right',
750-
the element is treated as <a href="#block-level">block-level</a> (and
751-
thus the <span class="propinst-display">'display'</span> property is
752-
ignored).
750+
the element said to be floating, and automatically becomes a <a
751+
href="#block-level">block-level</a> element.
752+
753+
<!-- Hakon: we can't say 'display' is ignored since 'none' still has
754+
an effect -->
753755

754756
<P> This property is most often used with inline images, but also
755757
applies to text elements.

0 commit comments

Comments
 (0)