Skip to content

Commit 995396f

Browse files
author
Greg Whitworth
committed
Merge branch 'master' of github.com:w3c/csswg-drafts
2 parents d8e87e2 + bbc45a8 commit 995396f

5 files changed

Lines changed: 25 additions & 8 deletions

File tree

css-box-3/Overview.bs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,11 @@ Margins at Container Edges: the 'margin-trim' property {#margin-trim}
362362

363363
ISSUE: Should floats have a <css>floats</css> value that only affects floats?
364364

365+
Note: See also the 'margin-break' property,
366+
which applies to the box’s own margins
367+
when they adjoin a <a>fragmentation break</a>
368+
(page break / column break / etc.).
369+
365370
Padding {#paddings}
366371
=======
367372

css-break-3/issues-cr-2016.bsi

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,10 @@ Issue 11.
9292
Summary: Clarify fragmentation of block margins at start/end of container
9393
From: David Baron
9494
Comment: https://github.com/w3c/csswg-drafts/issues/3073
95-
Open
95+
Response: https://github.com/w3c/csswg-drafts/issues/3073#issuecomment-430413829
96+
Changes: https://github.com/w3c/csswg-drafts/commit/8c875f0ec522aad17aa6a6aae2bc6d9472dc1c8f
97+
Closed: Accepted
98+
Resolved: https://lists.w3.org/Archives/Public/www-style/2018Nov/0003.html
99+
Verified: https://lists.w3.org/Archives/Public/www-style/2018Nov/0003.html
100+
Verified: https://github.com/w3c/csswg-drafts/issues/3073#issuecomment-438814049
96101
----

css-break-3/issues-cr-2016.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,17 @@ <h1>CSS Fragmentation Module Level 3 Disposition of Comments for 2016-01-14 CR</
127127
<span>Response: <a href='https://github.com/w3c/csswg-drafts/issues/1706#issuecomment-420474512'>https://github.com/w3c/csswg-drafts/issues/1706#issuecomment-420474512</a></span>
128128
<span class="a">Closed: Accepted</span>
129129
<span>Resolved: <a href='https://lists.w3.org/Archives/Public/www-style/2018Sep/0016.html'>https://lists.w3.org/Archives/Public/www-style/2018Sep/0016.html</a> <a href="https://www.w3.org/Mail/flatten/index?subject=https%3A%2F%2Flists.w3.org%2FArchives%2FPublic%2Fwww-style/2018Sep/0016.html"><abbr title="Thread">&#x2208;</abbr></a></span></pre>
130-
<pre class='open ' id='issue-11'>
130+
<pre class=' a' id='issue-11'>
131131
<span>Issue 11. <a href='#issue-11'>#</a></span>
132132
<span>Summary: Clarify fragmentation of block margins at start/end of container</span>
133133
<span>From: David Baron</span>
134134
<span>Comment: <a href='https://github.com/w3c/csswg-drafts/issues/3073'>https://github.com/w3c/csswg-drafts/issues/3073</a></span>
135-
<span>Open</span></pre>
135+
<span>Response: <a href='https://github.com/w3c/csswg-drafts/issues/3073#issuecomment-430413829'>https://github.com/w3c/csswg-drafts/issues/3073#issuecomment-430413829</a></span>
136+
<span>Changes: <a href='https://github.com/w3c/csswg-drafts/commit/8c875f0ec522aad17aa6a6aae2bc6d9472dc1c8f'>https://github.com/w3c/csswg-drafts/commit/8c875f0ec522aad17aa6a6aae2bc6d9472dc1c8f</a></span>
137+
<span class="a">Closed: Accepted</span>
138+
<span>Resolved: <a href='https://lists.w3.org/Archives/Public/www-style/2018Nov/0003.html'>https://lists.w3.org/Archives/Public/www-style/2018Nov/0003.html</a> <a href="https://www.w3.org/Mail/flatten/index?subject=https%3A%2F%2Flists.w3.org%2FArchives%2FPublic%2Fwww-style/2018Nov/0003.html"><abbr title="Thread">&#x2208;</abbr></a></span>
139+
<span class="a">Verified: <a href='https://lists.w3.org/Archives/Public/www-style/2018Nov/0003.html'>https://lists.w3.org/Archives/Public/www-style/2018Nov/0003.html</a> <a href="https://www.w3.org/Mail/flatten/index?subject=https%3A%2F%2Flists.w3.org%2FArchives%2FPublic%2Fwww-style/2018Nov/0003.html"><abbr title="Thread">&#x2208;</abbr></a></span>
140+
<span class="a">Verified: <a href='https://github.com/w3c/csswg-drafts/issues/3073#issuecomment-438814049'>https://github.com/w3c/csswg-drafts/issues/3073#issuecomment-438814049</a></span></pre>
136141
<script>
137142
(function () {
138143
var sheet = document.styleSheets[0];

css-break-4/Overview.bs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ Abstract: This module describes the fragmentation model that partitions a flow
1313
Abstract: It builds on the Page model module and introduces and defines the fragmentation model.
1414
Abstract: It adds functionality for pagination, breaking variable fragment size and orientation, widows and orphans.
1515
Ignored Terms: background positioning area, region chain, … message topic …, reference box
16-
At Risk: the ''region'' and ''break-after/avoid-region'' values of 'break-*'
1716
</pre>
1817

1918
<h1>CSS Fragmentation Module Level 4 <br> <small>Breaking the Web, one fragment at a time</small></h1>
@@ -45,7 +44,7 @@ Introduction</h2>
4544
<a>fragmentation containers</a> (<a>fragmentainers</a>)
4645
such as pages and columns
4746
and how such breaks can be
48-
<a href="#breaking-controls">controlled by the author</a>.
47+
<a href="https://www.w3.org/TR/css-break-3/#breaking-controls">controlled by the author</a>.
4948

5049
ISSUE: This is currently a diff spec.
5150
See <a href="https://www.w3.org/TR/css-break-3/">CSS Fragmentation Level 3</a>
@@ -79,7 +78,7 @@ Adjoining Margins at Breaks: the 'margin-break' property</h3>
7978
When a <em>forced break</em> occurs there,
8079
adjoining margins before the break are truncated,
8180
but margins after the break are preserved.
82-
<a href="#valdef-box-decoration-break-clone">Cloned margins</a>
81+
<a href="https://www.w3.org/TR/css-break-4/#valdef-box-decoration-break-clone">Cloned margins</a>
8382
are always truncated to zero.
8483

8584
Note: When margins collapse
@@ -98,7 +97,10 @@ Adjoining Margins at Breaks: the 'margin-break' property</h3>
9897
including at the start and end of a <a>fragmentation context</a>.
9998
</dl>
10099

101-
ISSUE: <a href="https://www.antennahouse.com/product/ahf66/ahf-focss6.html">Antenna House also allows a second ''keep'' keyword</a>,
100+
Note: See also the 'margin-trim' property,
101+
which applies to the <a>fragmentation container</a> (page/column/etc.)
102+
103+
ISSUE: <a href="https://www.antennahouse.com/product/ahf66/ahf-focss6.html">Antenna House also allows a second <css>keep</css> keyword</a>,
102104
which preserves the margin after the break;
103105
it is otherwise discarded.
104106
Do we want to include this feature?

css-multicol-1/Overview.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Introduction</h2>
4646

4747
(This section is not normative.)
4848

49-
This module describes multi-column layout in CSS. By using
49+
This module describes <dfn export>multi-column layout</dfn> in CSS. By using
5050
functionality described in this document, style sheets can declare
5151
that the content of an element is to be laid out in multiple
5252
columns.

0 commit comments

Comments
 (0)