Skip to content

Commit 25efd08

Browse files
author
Jihye Hong
authored
Merge branch 'master' into improve-distance-function
2 parents 74f5d44 + a91609b commit 25efd08

18 files changed

Lines changed: 1672 additions & 1073 deletions

File tree

css-conditional-3/Overview.bs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ Abstract: This module contains the features of CSS for conditional processing of
1919
conditional processing.
2020
At Risk: The inclusion of @font-face rules and @keyframes rules as allowed within all of the @-rules in this specification is at risk, though only because of the relative rates of advancement of specifications. If this specification is able to advance faster than one or both of the specifications defining those rules, then the inclusion of those rules will move from this specification to the specification defining those rules.
2121
At Risk: The addition of support for @-rules inside of conditional grouping rules is at risk; if interoperable implementations are not found, it may be removed to advance the other features in this specification to Proposed Recommendation.
22-
At Risk: The @supports rule is at risk; if interoperable implementations are not found, it may be removed to advance the other features in this specification to Proposed Recommendation.
2322
Default Highlight: css
2423
</pre>
2524

css-exclusions-1/Overview.bs

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,3 +856,25 @@ Acknowledgments</h2>
856856
Eugene Veselov,
857857
Stephen Zilles
858858
and the CSS Working Group members.
859+
860+
<h2 class="no-num" id="changes">Changes</h2>
861+
862+
<h3 class="no-num" id="recent-changes">
863+
Changes from the <a href="https://www.w3.org/TR/2015/WD-css3-exclusions-20150115/">15 January 2015 Working Draft</a></h3>
864+
865+
<h3 class="no-num" id="changes-2013">
866+
Changes from the <a href="https://www.w3.org/TR/2013/WD-css3-exclusions-20130528/">28 May 2013 Working Draft</a></h3>
867+
868+
<ul>
869+
<li>Editorial fixes.
870+
</ul>
871+
872+
<h3 class="no-num" id="changes-2012">
873+
Changes from the <a href="https://www.w3.org/TR/2012/WD-css3-exclusions-20120503/">3 May 2012 Working Draft</a></h3>
874+
875+
<ul>
876+
<li>Split Exclusions from Shapes.
877+
<li>Improved exclusion order example.
878+
<li>Editorial and markup fixes.
879+
<li>See also the Changes section of <a href="https://www.w3.org/TR/css-shapes/#20120503">CSS Shapes</a>.
880+
</ul>

css-font-loading-3/Overview.bs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -990,20 +990,18 @@ Interaction with CSS Font Loading and Matching</h3>
990990
-->
991991

992992
<h2 id='font-face-source'>
993-
The <code>FontFaceSource</code> interface</h2>
993+
The <code>FontFaceSource</code> mixin</h2>
994994

995995
<pre class='idl'>
996-
[Exposed=(Window,Worker),
997-
NoInterfaceObject]
998-
interface FontFaceSource {
996+
interface mixin FontFaceSource {
999997
readonly attribute FontFaceSet fonts;
1000998
};
1001999

1002-
Document implements FontFaceSource;
1003-
WorkerGlobalScope implements FontFaceSource;
1000+
Document includes FontFaceSource;
1001+
WorkerGlobalScope includes FontFaceSource;
10041002
</pre>
10051003

1006-
Any document, workers, or other context which can use fonts in some manner must implement the {{FontFaceSource}} interface.
1004+
Any document, workers, or other context which can use fonts in some manner must include the {{FontFaceSource}} mixin.
10071005
The value of the context’s {{fonts}} attribute is its <dfn>font source</dfn>,
10081006
which provides all of the fonts used in font-related operations,
10091007
unless defined otherwise.

css-gcpm-3/Overview.bs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,15 @@ h6 { bookmark-level: 6 }
896896

897897
<h2 class="no-num" id="changes">Appendix C: Changes</h2>
898898

899-
Changes since the <a href="https://hg.csswg.org/drafts/raw-file/6a5c44d11c2b/css-gcpm/Overview.html">24 September 2013 Editor’s Draft</a> are:
899+
Changes since the <a href="http://www.w3.org/TR/2014/WD-css-gcpm-3-20140513/">13 May 2014 Working Draft</a>:
900+
901+
<ul>
902+
<li>Clarify that bookmark is only created via 'bookmark-level' property. Remove <css>none</css> value from 'bookmark-label'.</li>
903+
<li>Move the cross references, leaders, and bookmarks sections to the <a href="https://www.w3.org/TR/css-content-3/">CSS Generated Content Module</a>.</li>
904+
</ul>
905+
906+
907+
Changes since the <a href="https://hg.csswg.org/drafts/raw-file/6a5c44d11c2b/css-gcpm/Overview.html">24 September 2013 Editor’s Draft</a>:
900908

901909

902910
<ul>
@@ -913,7 +921,8 @@ h6 { bookmark-level: 6 }
913921

914922

915923
</ul>
916-
In addition to the above changes, many other changes have been made since the <a href="https://www.w3.org/TR/2011/WD-css3-gcpm-20111129/">29 November 2011 Working Draft</a>:
924+
925+
Changes since the <a href="https://www.w3.org/TR/2011/WD-css3-gcpm-20111129/">29 November 2011 Working Draft</a>:
917926

918927
<ul>
919928
<li>

css-line-grid-1/Overview.bs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -757,6 +757,8 @@ Since <a href="https://www.w3.org/TR/2014/WD-css-line-grid-1-20140916/">Septembe
757757
<li>Added flex and grid container applicability for line-grid</li>
758758
<li>Added normative text for line-snap examples</li>
759759
<li>Added @page and root element line grid handling</li>
760+
<li>Made the dependency on line-height-step explicit</li>
761+
<li>''match-parent'' creates new line grid for orthoganal flows</li>
760762
</ul>
761763

762764
<h3 class="no-num" id="20140403">

css-lists-3/Overview.bs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1435,8 +1435,15 @@ Acknowledgments</h2>
14351435
Simon Montagu (Mozilla, smontagu@smontagu.org)
14361436

14371437

1438-
<h2 class="no-num" id="changes">
1439-
Changes From CSS2.1</h2>
1438+
<h2 class="no-num" id="changes">Changes</h2>
1439+
1440+
This section documents the changes since previous publications.
1441+
1442+
<h3 id="changes-20140320">Changes since the 20 March 2014 WD</h3>
1443+
1444+
Use <<custom-ident>> consistently for counter names.
1445+
1446+
<h3>Changes From CSS2.1</h3>
14401447

14411448
<p>As described in the introduction section, there are significant changes in this module when
14421449
compared to CSS2.1.

css-multicol-1/Overview.bs

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Link Defaults: css-color (property) color, css2 (property) max-height, css-backg
2525
At Risk: column-gap accepting <<length-percentage>> instead of <<length>>
2626
</pre>
2727
<pre class="link-defaults">
28-
spec:css22; type:dfn; text: table wrapper box
28+
spec:css-sizing-3; type:property; text:min-height
2929
</pre>
3030

3131
<style type="text/css">
@@ -51,13 +51,9 @@ Introduction</h2>
5151
that the content of an element is to be laid out in multiple
5252
columns.
5353

54-
On the Web, tables have also been used to describe multi-column
55-
layouts. The main benefit of using CSS-based columns is flexibility;
56-
content can flow from one column to another, and the number of columns
57-
can vary depending on the size of the viewport. Removing presentation
58-
table markup from documents allows them to more easily be presented on
59-
various output devices including speech synthesizers and small mobile
60-
devices.
54+
Other layout methods in CSS, when applied to a parent element, change the display properties of the direct children. For example if a three column grid layout is created, the direct children of the grid container become grid items and are placed into the column tracks, one element per cell with additional rows created as needed.
55+
56+
The child elements of a multi-column container however continue in normal flow, that flow is arranged into a number of columns. These columns have a flexible inline size, and therefore respond to available space by changing the size or number of columns displayed.
6157

6258
Multi-column layouts are easy to describe in CSS. Here is a simple example:
6359

@@ -586,7 +582,7 @@ Two assumptions are being made by the pseudo-algorithm:
586582
(11) W := max(0, ((U + column-gap)/N - column-gap))
587583
</pre>
588584

589-
For the purpose of finding the number of auto-repeated tracks, the UA must floor the track size to a UA-specified value to avoid division by zero. It is suggested that this floor be 1px or less.
585+
For the purpose of finding the number of auto-repeated columns, the UA must floor the column size to a UA-specified value to avoid division by zero. It is suggested that this floor be 1px or less.
590586

591587
In fragmented contexts such as in paged media, user agents may perform this calculation on a
592588
per-fragment basis.
@@ -1147,25 +1143,21 @@ Filling columns</h2>
11471143
<wpt>
11481144
multicol-fill-auto-001.xht
11491145
multicol-fill-auto-002.xht
1150-
multicol-fill-auto-003.xht
11511146
multicol-fill-auto-block-children-001.xht
11521147
multicol-fill-auto-block-children-002.xht
11531148
multicol-fill-balance-001.xht
11541149
</wpt>
11551150
</dl>
11561151

1157-
<!--
11581152
In continuous contexts, this property will only be consulted if the
1159-
length of columns has been constrained. Otherwise, columns will
1153+
length of columns has been constrained in the block dimension, including min and max constraints (e.g., 'height', 'min-height', 'max-height'). Otherwise, columns will
11601154
automatically be balanced.
1161-
-->
11621155

1163-
In continuous contexts, this property does not have any effect when there are overflow columns.
1156+
<wpt>
1157+
multicol-fill-auto-003.xht
1158+
</wpt>
11641159

1165-
<!--
1166-
In fragmented contexts, this property will only have
1167-
effect on the last fragment the multicol container appears in.
1168-
-->
1160+
In continuous contexts, this property does not have any effect when there are overflow columns.
11691161

11701162
<div class="example">
11711163
In this example, an article only has one short paragraph which fits
@@ -1189,12 +1181,12 @@ Filling columns</h2>
11891181
</div>
11901182

11911183
<div class="example">
1192-
In this example, column balancing is turned off:
1184+
In this example, column balancing is turned off, and the article has a height:
11931185

11941186
<pre highlight="css">
11951187
article {
11961188
width: 60em;
1197-
height: auto;
1189+
height: 4em;
11981190
columns: 4;
11991191
column-fill: auto;
12001192
}
@@ -1416,8 +1408,15 @@ Pagination and overflow outside multicol containers</h3>
14161408

14171409
This appendix is <em>informative</em>.
14181410

1419-
<h3 id="changes-from-20171005">Changes from the <a href="https://www.w3.org/TR/2017/WD-css-multicol-1-20171005/">Working Draft (WD) of 5 October 2017</a></h3>
1411+
<h3 id="changes-from-20180528">Changes from the <a href="https://www.w3.org/TR/2018/WD-css-multicol-1-20180528/">Working Draft (WD) of 28 May 2018</a></h3>
14201412
<ul>
1413+
<li>Added the paragraph "In continuous contexts, this property will only be consulted if the length of columns has been constrained in the block dimension, including min and max constraints (e.g., 'height', 'min-height', 'max-height'). Otherwise, columns will automatically be balanced." This paragraph (without the additional detail regarding min and max constraints) was commented out in 2012, causing an interoperability issue. Also corrected the example of content ending up all in the first column, by adding the height constraint. Resolved <a href="https://github.com/w3c/csswg-drafts/issues/3224#issuecomment-468089503">28 February 2019</a></li>
1414+
<li>Updated the introduction to remove mention of the benefits of multicol over using tables for layout and instead refer to the unique characteristics of multicol. Editorial change referenced in <a href="https://github.com/w3c/csswg-drafts/issues/3654">issue 3654</a>.</li>
1415+
<li>Changed the sentence added in the pseudo-algorithm section after the 7 Jan 2016 resolution, to refer to <em>columns</em> and not <em>tracks</em> as tracks are not defined in this specification. Resolved <a href="https://github.com/w3c/csswg-drafts/issues/3649#issuecomment-472505520">13 March 2019</a>.</li>
1416+
<li>Changes and clarifications to the SVG images used in the specification.</li>
1417+
</ul>
1418+
1419+
<h3 id="changes-from-20171005">Changes from the <a href="https://www.w3.org/TR/2017/WD-css-multicol-1-20171005/">Working Draft (WD) of 5 October 2017</a></h3>
14211420
<li>Changed references to paged media to refer to fragmented contexts. Resolved <a href="https://github.com/w3c/csswg-drafts/issues/1746#issuecomment-380731574">12 Apr 2018</a>.</li>
14221421
<li>Changed a line regarding the <code>column-fill</code> property:
14231422
<br><q>In continuous media, this property does not have any effect in

0 commit comments

Comments
 (0)