Skip to content

Commit a7759b0

Browse files
committed
[css-regions] update last two examples to use templates
1 parent 27da3aa commit a7759b0

2 files changed

Lines changed: 191 additions & 155 deletions

File tree

css3-regions/Overview.html

Lines changed: 95 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1647,50 +1647,62 @@ <h2 id=multi-column-regions><span class=secno>4. </span>Multi-column
16471647
<p>The following example:
16481648

16491649
<pre>
1650-
&lt;style&gt;
1651-
#multi-col {
1652-
column-count: 2;
1653-
flow-from: article;
1654-
height: 6em;
1655-
column-gap: 1em;
1656-
}
1657-
1658-
#remainder {
1659-
flow-from: article;
1660-
height: auto;
1661-
}
1662-
&lt;/style&gt;
1650+
&lt;body is="x-multicol-region"&gt;
1651+
&lt;article&gt;...&lt;/article&gt;
1652+
&lt;/body&gt;
16631653

1664-
&lt;article&gt;...&lt;/article&gt;
1665-
&lt;div id="multicol"&gt;&lt;/div&gt;
1666-
&lt;div id="remainder"&gt;&lt;/div&gt;</pre>
1654+
&lt;element name="x-multicol-region" extends="body"&gt;
1655+
&lt;template&gt;
1656+
&lt;style&gt;
1657+
#multi-col {
1658+
column-count: 2;
1659+
flow-from: article;
1660+
height: 6em;
1661+
column-gap: 1em;
1662+
}
1663+
1664+
#remainder {
1665+
flow-from: article;
1666+
height: auto;
1667+
}
1668+
&lt;/style&gt;
1669+
&lt;div id="multicol"&gt;&lt;/div&gt;
1670+
&lt;div id="remainder"&gt;&lt;/div&gt;
1671+
&lt;/template&gt;
1672+
&lt;/element&gt;</pre>
16671673

16681674
<p>is equivalent in rendering to, for example:
16691675

16701676
<pre>
1671-
&lt;style&gt;
1672-
#flex {
1673-
display: flex;
1674-
flex-pack: justify;
1675-
height: 6em;
1676-
}
1677-
#flex > div {
1678-
flow-from: article;
1679-
width: calc(50% - 0.5em);
1680-
}
1681-
1682-
#remainder {
1683-
flow-from: article;
1684-
height: auto;
1685-
}
1686-
&lt;/style&gt;
1677+
&lt;body is="x-single-col-regions"&gt;
1678+
&lt;article&gt;...&lt;/article&gt;
1679+
&lt;/body&gt;
16871680

1688-
&lt;article&gt;...&lt;/article&gt;
1689-
&lt;div id="flex"&gt;
1690-
&lt;div /&gt;
1691-
&lt;div /&gt;
1692-
&lt;/div&gt;
1693-
&lt;div id="remainder"&gt;&lt;/div&gt;</pre>
1681+
&lt;element name="x-single-col-regions" extends="body"&gt;
1682+
&lt;template&gt;
1683+
&lt;style&gt;
1684+
#flex {
1685+
display: flex;
1686+
flex-pack: justify;
1687+
height: 6em;
1688+
}
1689+
#flex > div {
1690+
flow-from: article;
1691+
width: calc(50% - 0.5em);
1692+
}
1693+
1694+
#remainder {
1695+
flow-from: article;
1696+
height: auto;
1697+
}
1698+
&lt;/style&gt;
1699+
&lt;div id="flex"&gt;
1700+
&lt;div /&gt;
1701+
&lt;div /&gt;
1702+
&lt;/div&gt;
1703+
&lt;div id="remainder"&gt;&lt;/div&gt;
1704+
&lt;/template&gt;
1705+
&lt;/element&gt;</pre>
16941706
</div>
16951707

16961708
<p>Overflow of multicol regions is mostly handled according to the same
@@ -2512,53 +2524,59 @@ <h3 id=regions-visual-formatting-examples><span class=secno>7.4.
25122524

25132525
<div class=example>
25142526
<pre>
2515-
&lt;style&gt;
2516-
article {
2517-
flow-into: article;
2518-
}
2519-
2520-
#rA, #rB, #rC {
2521-
flow-from: article;
2522-
height: auto;
2523-
2524-
margin: 1em 1em 0em 1em;
2525-
padding: 1em;
2526-
border: 3px solid #46A4E9;
2527-
}
2528-
2529-
#rA {
2530-
width: auto;
2531-
}
2532-
2533-
#rB {
2534-
float: left;
2535-
width: 15em;
2536-
max-height: 150px;
2537-
}
2538-
2539-
#rC {
2540-
float: right;
2541-
width: 12em;
2542-
}
2543-
2544-
#main-flow {
2545-
padding: 0em 1em 0em 1em;
2546-
}
2547-
2548-
&lt;/style&gt;
2549-
&lt;body&gt;
2527+
&lt;body is="x-formatting-example"&gt;
25502528
&lt;article&gt;
25512529
&lt;p style="break-after:region;"&gt;I am not a ... &lt;/p&gt;
25522530
&lt;p&gt;...&lt;/p&gt;
25532531
&lt;/article&gt;
2554-
&lt;div id="rA"&gt;&lt;/div&gt;
2555-
&lt;div id="rB"&gt;&lt;/div&gt;
2556-
&lt;div id="rC"&gt;&lt;/div&gt;
25572532

25582533
&lt;div id="main-flow"&gt;
25592534
&lt;p&gt;Lorem ipsum dolor ...&lt;/p&gt;
25602535
&lt;/div&gt;
2561-
&lt;/body&gt;
2536+
&lt;/body&gt;
2537+
2538+
&lt;element name="x-formatting-example" extends="body"&gt;
2539+
&lt;template&gt;
2540+
&lt;style&gt;
2541+
article {
2542+
flow-into: article;
2543+
}
2544+
2545+
#rA, #rB, #rC {
2546+
flow-from: article;
2547+
height: auto;
2548+
2549+
margin: 1em 1em 0em 1em;
2550+
padding: 1em;
2551+
border: 3px solid #46A4E9;
2552+
}
2553+
2554+
#rA {
2555+
width: auto;
2556+
}
2557+
2558+
#rB {
2559+
float: left;
2560+
width: 15em;
2561+
max-height: 150px;
2562+
}
2563+
2564+
#rC {
2565+
float: right;
2566+
width: 12em;
2567+
}
2568+
2569+
#main-flow {
2570+
padding: 0em 1em 0em 1em;
2571+
}
2572+
&lt;/style&gt;
2573+
2574+
&lt;div id="rA"&gt;&lt;/div&gt;
2575+
&lt;div id="rB"&gt;&lt;/div&gt;
2576+
&lt;div id="rC"&gt;&lt;/div&gt;
2577+
&lt;content&gt;&lt;/content&gt;
2578+
&lt;/template&gt;
2579+
&lt;/element&gt;
25622580
</pre>
25632581
</div>
25642582

css3-regions/Overview.src.html

Lines changed: 96 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1469,49 +1469,61 @@ <h2 id="multi-column-regions">Multi-column regions</h2>
14691469
<div class="example">
14701470
<p>The following example:</p>
14711471
<pre>
1472-
&lt;style&gt;
1473-
#multi-col {
1474-
column-count: 2;
1475-
flow-from: article;
1476-
height: 6em;
1477-
column-gap: 1em;
1478-
}
1479-
1480-
#remainder {
1481-
flow-from: article;
1482-
height: auto;
1483-
}
1484-
&lt;/style&gt;
1472+
&lt;body is="x-multicol-region"&gt;
1473+
&lt;article&gt;...&lt;/article&gt;
1474+
&lt;/body&gt;
1475+
1476+
&lt;element name="x-multicol-region" extends="body"&gt;
1477+
&lt;template&gt;
1478+
&lt;style&gt;
1479+
#multi-col {
1480+
column-count: 2;
1481+
flow-from: article;
1482+
height: 6em;
1483+
column-gap: 1em;
1484+
}
1485+
1486+
#remainder {
1487+
flow-from: article;
1488+
height: auto;
1489+
}
1490+
&lt;/style&gt;
1491+
&lt;div id="multicol"&gt&lt;/div&gt;
1492+
&lt;div id="remainder"&gt;&lt;/div&gt;
1493+
&lt;/template&gt;
1494+
&lt;/element&gt;</pre>
14851495

1486-
&lt;article&gt;...&lt;/article&gt;
1487-
&lt;div id="multicol"&gt&lt;/div&gt;
1488-
&lt;div id="remainder"&gt;&lt;/div&gt;</pre>
14891496
<p>is equivalent in rendering to, for example:</p>
14901497
<pre>
1491-
&lt;style&gt;
1492-
#flex {
1493-
display: flex;
1494-
flex-pack: justify;
1495-
height: 6em;
1496-
}
1497-
#flex > div {
1498-
flow-from: article;
1499-
width: calc(50% - 0.5em);
1500-
}
1501-
1502-
#remainder {
1503-
flow-from: article;
1504-
height: auto;
1505-
}
1506-
&lt;/style&gt;
1498+
&lt;body is="x-single-col-regions"&gt;
1499+
&lt;article&gt;...&lt;/article&gt;
1500+
&lt;/body&gt;
15071501

1508-
&lt;article&gt;...&lt;/article&gt;
1509-
&lt;div id="flex"&gt;
1510-
&lt;div /&gt;
1511-
&lt;div /&gt;
1512-
&lt;/div&gt;
1513-
&lt;div id="remainder"&gt;&lt;/div&gt;</pre>
1514-
1502+
&lt;element name="x-single-col-regions" extends="body"&gt;
1503+
&lt;template&gt;
1504+
&lt;style&gt;
1505+
#flex {
1506+
display: flex;
1507+
flex-pack: justify;
1508+
height: 6em;
1509+
}
1510+
#flex > div {
1511+
flow-from: article;
1512+
width: calc(50% - 0.5em);
1513+
}
1514+
1515+
#remainder {
1516+
flow-from: article;
1517+
height: auto;
1518+
}
1519+
&lt;/style&gt;
1520+
&lt;div id="flex"&gt;
1521+
&lt;div /&gt;
1522+
&lt;div /&gt;
1523+
&lt;/div&gt;
1524+
&lt;div id="remainder"&gt;&lt;/div&gt;
1525+
&lt;/template&gt;
1526+
&lt;/element&gt;</pre>
15151527

15161528

15171529
</div>
@@ -2249,53 +2261,59 @@ <h3 id="regions-visual-formatting-examples">Regions visual formatting example</h
22492261

22502262
<div class="example">
22512263
<pre>
2252-
&lt;style&gt;
2253-
article {
2254-
flow-into: article;
2255-
}
2256-
2257-
#rA, #rB, #rC {
2258-
flow-from: article;
2259-
height: auto;
2260-
2261-
margin: 1em 1em 0em 1em;
2262-
padding: 1em;
2263-
border: 3px solid #46A4E9;
2264-
}
2265-
2266-
#rA {
2267-
width: auto;
2268-
}
2269-
2270-
#rB {
2271-
float: left;
2272-
width: 15em;
2273-
max-height: 150px;
2274-
}
2275-
2276-
#rC {
2277-
float: right;
2278-
width: 12em;
2279-
}
2280-
2281-
#main-flow {
2282-
padding: 0em 1em 0em 1em;
2283-
}
2284-
2285-
&lt;/style&gt;
2286-
&lt;body&gt;
2264+
&lt;body is="x-formatting-example"&gt;
22872265
&lt;article&gt;
22882266
&lt;p style="break-after:region;"&gt;I am not a ... &lt;/p&gt;
22892267
&lt;p&gt;...&lt;/p&gt;
22902268
&lt;/article&gt;
2291-
&lt;div id="rA"&gt;&lt;/div&gt;
2292-
&lt;div id="rB"&gt;&lt;/div&gt;
2293-
&lt;div id="rC"&gt;&lt;/div&gt;
22942269

22952270
&lt;div id="main-flow"&gt;
22962271
&lt;p&gt;Lorem ipsum dolor ...&lt;/p&gt;
22972272
&lt;/div&gt;
2298-
&lt;/body&gt;
2273+
&lt;/body&gt;
2274+
2275+
&lt;element name="x-formatting-example" extends="body"&gt;
2276+
&lt;template&gt;
2277+
&lt;style&gt;
2278+
article {
2279+
flow-into: article;
2280+
}
2281+
2282+
#rA, #rB, #rC {
2283+
flow-from: article;
2284+
height: auto;
2285+
2286+
margin: 1em 1em 0em 1em;
2287+
padding: 1em;
2288+
border: 3px solid #46A4E9;
2289+
}
2290+
2291+
#rA {
2292+
width: auto;
2293+
}
2294+
2295+
#rB {
2296+
float: left;
2297+
width: 15em;
2298+
max-height: 150px;
2299+
}
2300+
2301+
#rC {
2302+
float: right;
2303+
width: 12em;
2304+
}
2305+
2306+
#main-flow {
2307+
padding: 0em 1em 0em 1em;
2308+
}
2309+
&lt;/style&gt;
2310+
2311+
&lt;div id="rA"&gt;&lt;/div&gt;
2312+
&lt;div id="rB"&gt;&lt;/div&gt;
2313+
&lt;div id="rC"&gt;&lt;/div&gt;
2314+
&lt;content&gt;&lt;/content&gt;
2315+
&lt;/template&gt;
2316+
&lt;/element&gt;
22992317
</pre>
23002318
</div>
23012319

0 commit comments

Comments
 (0)