Skip to content

Commit aa7b90b

Browse files
committed
implementing changes from the CSS WG meeting
1 parent dc01968 commit aa7b90b

1 file changed

Lines changed: 17 additions & 9 deletions

File tree

css3-multicol/Overview.src.html

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -262,8 +262,8 @@ <h2>The multi-column model</h2>
262262
<p>In the simplest case a multicol element will contain only one row
263263
of columns, and the height of each column will be equivalent to the
264264
used height of the multi-column element's content box. If the
265-
multi-column element is paginated, then the height of each row is
266-
constrained by the page, and the content continues in a new row of
265+
multi-column element is paginated, the height of each row is
266+
constrained by the page and the content continues in a new row of
267267
column boxes on the next page; a column box never splits across pages.
268268
The same effect occurs when a <em>spanning element</em> divides the
269269
multi-column element: the columns before the spanning element are
@@ -284,7 +284,7 @@ <h2>The multi-column model</h2>
284284
<p>Column gaps (yellow) and column rules (green) are shown in this
285285
sample rendition of a multi-column element with padding (blue). The
286286
blue and yellow is present for illustrational purposes only. In actual
287-
implementations these ares will be determined by the background.
287+
implementations these areas will be determined by the background.
288288

289289
<div class=cols>
290290

@@ -1230,10 +1230,10 @@ <h3>'column-span'</h3>
12301230
<td><dfn>column-span</dfn>
12311231
<tr>
12321232
<td><em>Value:</em>
1233-
<td>1 | all
1233+
<td>none | all
12341234
<tr>
12351235
<td><em>Initial:</em>
1236-
<td>1
1236+
<td>none
12371237
<tr>
12381238
<td><em>Applies to:</em>
12391239
<td>static, non-floating elements,
@@ -1255,29 +1255,31 @@ <h3>'column-span'</h3>
12551255

12561256
<dl>
12571257

1258-
<dt>1
1258+
<dt>none
12591259
<dd>The element does not span multiple columns.
12601260

12611261
<dt>all
12621262

12631263
<dd>The element spans across all columns. Content in the normal flow
12641264
that appears before the element is automatically balanced across all
1265-
columns before the element appears.
1265+
columns before the element appears. The element establishes a new
1266+
block formatting context.
12661267

12671268
</dl>
12681269

12691270
<p>An element that spans more than one column is called a
12701271
<dfn>spanning element</dfn>.
12711272

1273+
<!--
12721274
<p>This property has no effect on elements that do not fit entirely
12731275
within the multicol element. Also, if a setting on this property pushes the
12741276
element outside a multicol element, this property will have no effect.
1275-
1277+
-->
12761278

12771279
<div class="example">
12781280

12791281
<p>In this example, an <code>h2</code> element has been added to the
1280-
sample document after the first sentence in the fourth alphabet (i.e.,
1282+
sample document after the first sentence in the fourth sentence (i.e.,
12811283
after the word "jkl."). This styling applies:
12821284

12831285
<pre class="css">
@@ -1341,6 +1343,12 @@ <h3>'column-span'</h3>
13411343

13421344
</div>
13431345

1346+
<p>A spanning element takes up more space than the element would take
1347+
up otherwise. When space is limited, it may be impossible to find room
1348+
for the spanning element. In these cases, user agents may treat the
1349+
element as if 'none' had been specified.
1350+
1351+
13441352

13451353
<h2>Filling columns</h2>
13461354

0 commit comments

Comments
 (0)