Skip to content

Commit 1c89a1a

Browse files
author
dauwhe
committed
merge
2 parents 007fb05 + 42a6a3f commit 1c89a1a

15 files changed

Lines changed: 1005 additions & 491 deletions

File tree

‎css-break/fragmented-transforms.html‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<!DOCTYPE html>
2+
<meta charset=utf-8>
3+
4+
<style>
5+
.page {
6+
background: white;
7+
border: 1px solid; box-shadow: 2px 2px 2px gray;
8+
padding: 3px 2px;
9+
margin: -1px 25%;
10+
width: 75px;
11+
height: 105px; }
12+
13+
.container {
14+
background: green;
15+
transform: rotate(15deg);
16+
height: 100%;
17+
position: relative;
18+
}
19+
20+
.origin {
21+
border-radius: 100%;
22+
border: 5px solid red;
23+
margin: -5px;
24+
width: 0;
25+
position: absolute;
26+
top: 50%;
27+
left: 50%;
28+
}
29+
30+
.c1 {
31+
height: 100%;
32+
}
33+
34+
.c2 {
35+
height: 50%;
36+
}
37+
38+
.c3 {
39+
height: 0;
40+
}
41+
42+
.content {
43+
height: 105px;
44+
background: top left / 10px 10px linear-gradient(gray 50%, transparent 0);
45+
}
46+
</style>
47+
48+
<div class="page">
49+
<div class="container c1">
50+
<div class="origin"></div>
51+
<div class="content"></div>
52+
</div>
53+
</div>
54+
55+
<div class="page">
56+
<div class="container c1">
57+
<div class="origin"></div>
58+
<div class="content"></div>
59+
</div>
60+
</div>
61+
62+
<div class="page">
63+
<div class="container c2">
64+
<div class="origin"></div>
65+
<div class="content"></div>
66+
</div>
67+
</div>
68+
69+
<div class="page">
70+
<div class="container c3">
71+
<div class="origin"></div>
72+
<div class="content"></div>
73+
</div>
74+
</div>

‎css-break/fragmented-transforms.png‎

22.8 KB
Loading

‎css-exclusions/Overview.bs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ Exclusions</h2>
106106
containing block's <span>wrapping context</span>. As a consequence, exclusions
107107
impact the layout of their containing block's descendants.
108108

109-
Elements layout their inline content in their <span>content area</span> and wrap
109+
Elements lay out their inline content in their <span>content area</span> and wrap
110110
around the <span>exclusion areas</span> in their associated <span>wrapping
111111
context</span>. If the element is itself an exclusion, it does not wrap around
112112
its own exclusion area and the impact of other exclusions on other exclusions
@@ -533,7 +533,7 @@ Description</h4>
533533
<ul>
534534
<li><strong>Step 1</strong>: resolve exclusion boxes belonging to each
535535
<a>wrapping context</a>
536-
<li><strong>Step 2</strong>: resolve each <a>wrapping context</a> and layout
536+
<li><strong>Step 2</strong>: resolve each <a>wrapping context</a> and lay out
537537
each containing block in turn:
538538
<ul>
539539
<li><strong>Step 2-A</strong>: resolve the position and size of exclusion

‎css-exclusions/Overview.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
</p>
7373
<h1 class="p-name no-ref" id=title>CSS Exclusions Module Level 1</h1>
7474
<h2 class="no-num no-toc no-ref heading settled" id=subtitle><span class=content>Editor’s Draft,
75-
<span class=dt-updated><span class=value-title title=20141024>24 October 2014</span></span></span></h2>
75+
<span class=dt-updated><span class=value-title title=20141027>27 October 2014</span></span></span></h2>
7676
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-exclusions/>http://dev.w3.org/csswg/css-exclusions/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css3-exclusions/>http://www.w3.org/TR/css3-exclusions/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2013/WD-css3-exclusions-20130528/ rel=previous>http://www.w3.org/TR/2013/WD-css3-exclusions-20130528/</a><dt>Feedback:<dd><span><a href="mailto:www-style@w3.org?subject=[css-exclusions] feedback">www-style@w3.org</a> with subject line “<kbd>[css-exclusions] <var>… message topic …</var></kbd>” (<a href=http://lists.w3.org/Archives/Public/www-style/ rel=discussion>archives</a>)</span><dt>Test Suite:<dd><a href=http://test.csswg.org/suites/css-exclusions-1_dev/nightly-unstable/>http://test.csswg.org/suites/css-exclusions-1_dev/nightly-unstable/</a><dd><span><a href=http://test.csswg.org/suites/css3-exclusions/nightly-unstable/>http://test.csswg.org/suites/css3-exclusions/nightly-unstable/</a></span><dt>Editors:<dd><div class="p-author h-card vcard"><a class="p-name fn u-email email" href=mailto:ratan@microsoft.com>Rossen Atanassov</a> (<span class="p-org org">Microsoft</span>)</div><dd><div class="p-author h-card vcard"><a class="p-name fn u-email email" href=mailto:vhardy@adobe.com>Vincent Hardy</a> (<span class="p-org org">Adobe</span>)</div><dd><div class="p-author h-card vcard"><a class="p-name fn u-email email" href=mailto:astearns@adobe.com>Alan Stearns</a> (<span class="p-org org">Adobe</span>)</div><dt>Issues list:<dd><span><a href="https://www.w3.org/Bugs/Public/buglist.cgi?query_format=advanced&amp;product=CSS&amp;component=Exclusions&amp;resolution=---&amp;cmdtype=doit">in Bugzilla</a></span></dl></div>
7777
<div data-fill-with=warning></div>
7878
<p class=copyright data-fill-with=copyright><a href=http://www.w3.org/Consortium/Legal/ipr-notice#Copyright>Copyright</a> © 2014 <a href=http://www.w3.org/><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href=http://www.csail.mit.edu/><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href=http://www.ercim.eu/><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href=http://www.keio.ac.jp/>Keio</a>, <a href=http://ev.buaa.edu.cn/>Beihang</a>), All Rights Reserved. W3C <a href=http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer>liability</a>, <a href=http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks>trademark</a> and <a href=http://www.w3.org/Consortium/Legal/copyright-documents>document use</a> rules apply.
@@ -234,11 +234,11 @@ <h2 class="heading settled" data-level=3 id=exclusions><span class=secno>3. </sp
234234
containing block’s <span>wrapping context</span>. As a consequence, exclusions
235235
impact the layout of their containing block’s descendants.</p>
236236

237-
<p>Elements layout their inline content in their <span>content area</span> and wrap
237+
<p>Elements lay out their inline content in their <span>content area</span> and wrap
238238
around the <span>exclusion areas</span> in their associated <span>wrapping
239239
context</span>. If the element is itself an exclusion, it does not wrap around
240240
its own exclusion area and the impact of other exclusions on other exclusions
241-
is controlled by the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#z-index title=z-index>z-index</a> property as explained in the
241+
is controlled by the <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#propdef-z-index title=z-index>z-index</a> property as explained in the
242242
'exclusions order' section.</p>
243243

244244
<h3 class="heading settled" data-level=3.1 id=declaring-exclusions><span class=secno>3.1. </span><span class=content>
@@ -431,7 +431,7 @@ <h3 class="heading settled" data-level=3.2 id=scope-and-effect-of-exclusions><sp
431431
(see the <a href=#propagation-of-exclusions>propagation of exclusions</a>
432432
section below).</p>
433433

434-
<p>As a reminder, for exclusions with <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#position title=position>position</a>:<span class=css>fixed</span>, the containing block
434+
<p>As a reminder, for exclusions with <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#propdef-position title=position>position</a>:<span class=css>fixed</span>, the containing block
435435
is established by the root element.</p>
436436

437437

@@ -542,10 +542,10 @@ <h3 class="heading settled" data-level=3.4 id=exclusions-order><span class=secno
542542
applied in reverse to the document order in which they are defined. The last exclusion
543543
appears on top of all other exclusion, thus it affects the inline flow content of
544544
all other preceding exclusions or elements descendant of the same containing block.
545-
The <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#z-index title=z-index>z-index</a> property can be used to change the ordering of
545+
The <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#propdef-z-index title=z-index>z-index</a> property can be used to change the ordering of
546546
<a href=http://www.w3.org/TR/CSS2/visuren.html#choose-position>positioned</a> exclusion
547547
boxes (see <a data-biblio-type=normative data-link-type=biblio href=#biblio-css21 title=CSS21>[CSS21]</a>). Statically positioned exclusions are not affected by the
548-
<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#z-index title=z-index>z-index</a> property and thus follow the painting order.</p>
548+
<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#propdef-z-index title=z-index>z-index</a> property and thus follow the painting order.</p>
549549

550550
<div class=example>
551551

@@ -642,7 +642,7 @@ <h4 class="heading settled" data-level=3.5.1 id=exclusions-processing-model-desc
642642
<ul>
643643
<li><strong>Step 1</strong>: resolve exclusion boxes belonging to each
644644
<a data-link-type=dfn href=#wrapping-context title="wrapping context">wrapping context</a>
645-
<li><strong>Step 2</strong>: resolve each <a data-link-type=dfn href=#wrapping-context title="wrapping context">wrapping context</a> and layout
645+
<li><strong>Step 2</strong>: resolve each <a data-link-type=dfn href=#wrapping-context title="wrapping context">wrapping context</a> and lay out
646646
each containing block in turn:
647647
<ul>
648648
<li><strong>Step 2-A</strong>: resolve the position and size of exclusion
@@ -686,7 +686,7 @@ <h4 class="heading settled" data-level=3.5.4 id=step-2-A><span class=secno>3.5.4
686686
block’s</a> <a data-link-type=dfn href=#wrapping-context title="wrapping context">wrapping context</a>.</p>
687687

688688
<p>Scrolling is ignored in this step when resolving the position and size of
689-
<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#position title=position>position</a>: <span class=css>fixed</span> <a data-link-type=dfn href=#exclusion-box title="exclusion boxes">exclusion boxes</a>.</p>
689+
<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-position-3/#propdef-position title=position>position</a>: <span class=css>fixed</span> <a data-link-type=dfn href=#exclusion-box title="exclusion boxes">exclusion boxes</a>.</p>
690690

691691
<p>Once the <a href=http://www.w3.org/TR/CSS2/visudet.html#containing-block-details>containing block’s</a> <a data-link-type=dfn href=#wrapping-context title="wrapping context">wrapping context</a> is computed, all <a data-link-type=dfn href=#exclusion-box title="exclusion boxes">exclusion boxes</a> in
692692
that <a data-link-type=dfn href=#wrapping-context title="wrapping context">wrapping context</a> are removed from the normal flow.</p>

‎css-exclusions/Overview.src.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ <h2 id="exclusions">Exclusions</h2>
195195
<p>
196196

197197
<p>
198-
Elements layout their inline content in their <span>content area</span> and wrap around the
198+
Elements lay out their inline content in their <span>content area</span> and wrap around the
199199
<span>exclusion areas</span> in their associated <span>wrapping context</span>. If the element is itself an exclusion, it
200200
does not wrap around its own exclusion area and the impact of other exclusions on other
201201
exclusions is controlled by the 'z-index' property as explained in the

‎css-grid/Overview.bs‎

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3023,8 +3023,52 @@ Find the Size of an ''fr''</h4>
30233023
<h2 id='pagination'>
30243024
Fragmenting Grid Layout</h2>
30253025

3026-
<p class='issue'>
3027-
Fill this in.
3026+
Grid containers break across fragment containers (fragmentainers) [[!CSS3-BREAK]] between
3027+
grid rows. The break-* properties do not apply to grid areas. When fragmentating grid containers
3028+
the goal is to minimize the number of grid areas that get fragmented due to their grid row
3029+
being fragmented.
3030+
3031+
<h3 id="fragmentation-alg">
3032+
Sample Fragmentation Algorithm</h3>
3033+
3034+
<ol>
3035+
<li>
3036+
Layout the grid following the <a section href="#layout-algorithm"></a> by using the
3037+
fragmentainer box width and assume unlimited height. During this step all 'grid-row'
3038+
''auto'' and ''fr'' values must be resolved.
3039+
3040+
<li>
3041+
Layout the grid container using the values resolved in the previous step.
3042+
3043+
<li>
3044+
If a grid row extends past the current fragment and it is not the first grid row in
3045+
this fragment; push it to the next fragment. Do this even if the grid row has no items.
3046+
3047+
<li>
3048+
If a grid area dimensions change due to fragmentation (do not include items that
3049+
span rows in this decision), increase the grid row as necessary for rows that either:
3050+
<ul>
3051+
<li>
3052+
have a content min track sizing function.
3053+
3054+
<li>
3055+
are in a grid that does not have an explicit height and the grid row is flexible.
3056+
</ul>
3057+
3058+
<li>
3059+
If the grid height is ''auto'', the height of the grid should be the sum of the final
3060+
row sizes.
3061+
3062+
<li>
3063+
If a grid area overflows the grid container due to margins being collapsed during
3064+
fragmentation, extend the grid container to contain this grid area (this step is
3065+
necessary in order to avoid circular layout dependencies due to fragmentation).
3066+
</ol>
3067+
3068+
<p class="note">
3069+
If the grid’s height is specified, steps three and four may cause the grid rows to
3070+
overflow the grid.
3071+
</p>
30283072

30293073
<h2 class="no-num" id="acks">
30303074
Acknowledgements</h2>

0 commit comments

Comments
 (0)