- From: H?kon Wium Lie via cvs-syncmail <cvsmail@w3.org>
- Date: Wed, 21 Sep 2011 13:23:55 +0000
- To: public-css-commits@w3.org
Update of /sources/public/csswg/css3-gcpm
In directory hutz:/tmp/cvs-serv3678
Modified Files:
Overview.src.html
Log Message:
Index: Overview.src.html
===================================================================
RCS file: /sources/public/csswg/css3-gcpm/Overview.src.html,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- Overview.src.html 1 Nov 2010 11:21:03 -0000 1.114
+++ Overview.src.html 21 Sep 2011 13:23:53 -0000 1.115
@@ -2071,6 +2071,11 @@
<p>The 'marks' property from [[CSS2]] is part of this specification.
+<!--
+http://www.w3.org/TR/2008/REC-CSS2-20080411/page.html#propdef-marks
+-->
+
+
<table class=propdef>
<tr>
<td><em>Name:</em>
@@ -2498,10 +2503,10 @@
<dd>On a left page, this value is synonymous with 'left', On a right page, this value is synonymous with 'right'.
<dt>page
- <dd>Indicates that the page area is the flow root for the element.
+ <dd>Indicates that the page area is the float-root for the element.
<dt>multicol
- <dd>Indicates that the multicol element is the flow root for the element.
+ <dd>Indicates that the multicol element is the float-root for the element.
<dt>intrude
<dd>The element may intrude neighboring columns; if the element is not in a multi-column element, this keyword has no effect.
@@ -2686,7 +2691,7 @@
<div class=example>
<pre class=css>
-img { float: left; width: 120% }
+img { float: left intrude; width: 120%; }
</pre>
<p>In this example, the image is wider than the column and will
@@ -2755,7 +2760,7 @@
<div class=example>
<pre class=css>
-img { float: right; width: 120% }
+img { float: right intrude; width: 120% }
</pre>
<p>In this example, the image naturally appears in the last column. Due to being floated to the right, the image will intrude into the neighboring column to the left.
@@ -3410,8 +3415,7 @@
</div>
-<h3>Aligning baselines</h3>
-
+<h2>Aligning baselines in multi-column layouts</h2>
<p>In multi-column layouts, baselines are typically aligned between
Received on Wednesday, 21 September 2011 13:24:01 UTC