8000 Merge branch 'master' of github.com:w3c/csswg-drafts · w3c/csswg-drafts@efa08b6 · GitHub
Skip to content

Commit efa08b6

Browse files
johanneswilmjohanneswilm
committed
Merge branch 'master' of github.com:w3c/csswg-drafts
2 parents 1712db7 + e362c83 commit efa08b6

13 files changed

Lines changed: 2470 additions & 470 deletions

File tree

‎css-align/Overview.bs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,7 @@ Baseline Self-Alignment</h3>
825825

826826
<dt>Grid Items:
827827
<dd>
828-
A <a>grid item</a> participates in first (last) <a>baseline content-alignment</a>
828+
A <a>grid item</a> participates in first (last) <a>baseline self-alignment</a>
829829
in either its row or column (whichever matches its <a>inline axis</a>)
830830
if its 'justify-self' or 'align-self' property (whichever matches its <a>inline axis</a>)
831831
computes to ''baseline'' (''last-baseline'').

‎css-break/Overview.bs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Values</h3>
7575
<h2 id="fragmentation-model">
7676
Fragmentation Model and Terminology</h2>
7777

78-
<dl>
78+
<dl export>
7979
<dt><dfn>fragmentation container</dfn> (<dfn>fragmentainer</dfn>)</dt>
8080
<dd>
8181
A box&mdash;such as a page box, column box, or region&mdash;that contains

‎css-break/Overview.html‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
<title>CSS Fragmentation Module Level 3</title>
99

1010

11+
<meta content="refining" name="csswg-work-status">
12+
13+
14+
<meta content="ED" name="w3c-status">
15+
16+
1117
<link href="../default.css" rel="stylesheet" type="text/css">
1218

1319

@@ -74,7 +80,7 @@
7480
<h1 class="p-name no-ref" id="title">CSS Fragmentation Module Level 3</h1>
7581

7682
<h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="content">Editor’s Draft,
77-
<time class="dt-updated" datetime="2015-05-17">17 May 2015</time></span></h2>
83+
<time class="dt-updated" datetime="2015-06-20">20 June 2015</time></span></h2>
7884

7985
<div data-fill-with="spec-metadata">
8086
<dl>
@@ -85,7 +91,7 @@ <h2 class="no-num no-toc no-ref heading settled" id="subtitle"><span class="cont
8591
<dt>Previous Versions:
8692
<dd><a href="http://www.w3.org/TR/2015/WD-css3-break-20150129/" rel="previous">http://www.w3.org/TR/2015/WD-css3-break-20150129/</a>
8793
<dt>Feedback:
88-
<dd><span><a href="mailto:www-style@w3.org?subject=%5Bcss-break%5D%20feedback">www-style@w3.org</a> with subject line “<kbd>[css-break] <var>… message topic …</var></kbd>” (<a href="http://lists.w3.org/Archives/Public/www-style/" rel="discussion">archives</a>)</span>
94+
<dd><span><a href="mailto:www-style@w3.org?subject=%5Bcss-break%5D%20YOUR%20TOPIC%20HERE">www-style@w3.org</a> with subject line “<kbd>[css-break] <var>… message topic …</var></kbd>” (<a href="http://lists.w3.org/Archives/Public/www-style/" rel="discussion">archives</a>)</span>
8995
<dt>Issue Tracking:
9096
<dd><a href="#issues-index">Inline In Spec</a>
9197
<dt class="editor">Editors:
@@ -345,7 +351,7 @@ <h2 class="heading settled" data-level="2" id="fragmentation-model"><span class=
345351

346352
<dl>
347353

348-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="fragmentation-container">fragmentation container<a class="self-link" href="#fragmentation-container"></a></dfn> (<dfn data-dfn-type="dfn" data-noexport="" id="fragmentainer">fragmentainer<a class="self-link" href="#fragmentainer"></a></dfn>)
354+
<dt><dfn data-dfn-type="dfn" data-export="" id="fragmentation-container">fragmentation container<a class="self-link" href="#fragmentation-container"></a></dfn> (<dfn data-dfn-type="dfn" data-export="" id="fragmentainer">fragmentainer<a class="self-link" href="#fragmentainer"></a></dfn>)
349355

350356

351357
<dd>
@@ -358,7 +364,7 @@ <h2 class="heading settled" data-level="2" id="fragmentation-model"><span class=
358364

359365

360366

361-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="fragmentation-context">fragmentation context<a class="self-link" href="#fragmentation-context"></a></dfn>
367+
<dt><dfn data-dfn-type="dfn" data-export="" id="fragmentation-context">fragmentation context<a class="self-link" href="#fragmentation-context"></a></dfn>
362368

363369

364370
<dd>
@@ -373,17 +379,17 @@ <h2 class="heading settled" data-level="2" id="fragmentation-model"><span class=
373379

374380

375381

376-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="fragmented-flow">fragmented flow<a class="self-link" href="#fragmented-flow"></a></dfn>
382+
<dt><dfn data-dfn-type="dfn" data-export="" id="fragmented-flow">fragmented flow<a class="self-link" href="#fragmented-flow"></a></dfn>
377383

378384

379385
<dd>
380386
A content flow that is being laid out in a <a data-link-type="dfn" href="#fragmentation-context">fragmentation context</a>.
381387
The <a data-link-type="dfn" href="#fragmented-flow">fragmented flow</a> consists of the content of a (possibly anonymous) box
382-
called the <dfn data-dfn-type="dfn" data-noexport="" id="fragmentation-root">fragmentation root<a class="self-link" href="#fragmentation-root"></a></dfn>.
388+
called the <dfn data-dfn-type="dfn" data-export="" id="fragmentation-root">fragmentation root<a class="self-link" href="#fragmentation-root"></a></dfn>.
383389

384390

385391

386-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="fragmentation-direction">fragmentation direction<a class="self-link" href="#fragmentation-direction"></a></dfn>
392+
<dt><dfn data-dfn-type="dfn" data-export="" id="fragmentation-direction">fragmentation direction<a class="self-link" href="#fragmentation-direction"></a></dfn>
387393

388394

389395
<dd>
@@ -393,7 +399,7 @@ <h2 class="heading settled" data-level="2" id="fragmentation-model"><span class=
393399

394400

395401

396-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="fragmentation">fragmentation<a class="self-link" href="#fragmentation"></a></dfn>
402+
<dt><dfn data-dfn-type="dfn" data-export="" id="fragmentation">fragmentation<a class="self-link" href="#fragmentation"></a></dfn>
397403

398404

399405
<dd>
@@ -402,15 +408,15 @@ <h2 class="heading settled" data-level="2" id="fragmentation-model"><span class=
402408

403409

404410

405-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="box-fragment">box fragment<a class="self-link" href="#box-fragment"></a></dfn> or <dfn data-dfn-type="dfn" data-noexport="" id="fragment">fragment<a class="self-link" href="#fragment"></a></dfn>
411+
<dt><dfn data-dfn-type="dfn" data-export="" id="box-fragment">box fragment<a class="self-link" href="#box-fragment"></a></dfn> or <dfn data-dfn-type="dfn" data-export="" id="fragment">fragment<a class="self-link" href="#fragment"></a></dfn>
406412

407413

408414
<dd>
409415
The portion of a box that belongs to exactly one <a data-link-type="dfn" href="#fragmentainer">fragmentainer</a>.
410416
A box in continuous flow always consists of only one fragment.
411417
A box in a fragmented flow consists of one or more fragments.
412418

413-
<dt><dfn data-dfn-type="dfn" data-noexport="" id="remaining-fragmentainer-extent">remaining fragmentainer extent<a class="self-link" href="#remaining-fragmentainer-extent"></a></dfn>
419+
<dt><dfn data-dfn-type="dfn" data-export="" id="remaining-fragmentainer-extent">remaining fragmentainer extent<a class="self-link" href="#remaining-fragmentainer-extent"></a></dfn>
414420

415421

416422
<dd>
@@ -2306,7 +2312,7 @@ <h3 class="no-num heading settled" id="informative"><span class="content">Inform
23062312
<dt id="biblio-css3val"><a class="self-link" href="#biblio-css3val"></a>[CSS3VAL]
23072313
<dd>Håkon Wium Lie; Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css3-values/">CSS Values and Units Module Level 3</a>. 30 July 2013. CR. URL: <a href="http://www.w3.org/TR/css3-values/">http://www.w3.org/TR/css3-values/</a>
23082314
<dt id="biblio-css3-flexbox"><a class="self-link" href="#biblio-css3-flexbox"></a>[CSS3-FLEXBOX]
2309-
<dd>Tab Atkins Jr.; Elika Etemad; Rossen Atanassov. <a href="http://www.w3.org/TR/css-flexbox-1/">CSS Flexible Box Layout Module Level 1</a>. 25 September 2014. LCWD. URL: <a href="http://www.w3.org/TR/css-flexbox-1/">http://www.w3.org/TR/css-flexbox-1/</a>
2315+
<dd>Tab Atkins Jr.; Elika Etemad; Rossen Atanassov. <a href="http://www.w3.org/TR/css-flexbox-1/">CSS Flexible Box Layout Module Level 1</a>. 14 May 2015. LCWD. URL: <a href="http://www.w3.org/TR/css-flexbox-1/">http://www.w3.org/TR/css-flexbox-1/</a>
23102316
<dt id="biblio-css3-sizing"><a class="self-link" href="#biblio-css3-sizing"></a>[CSS3-SIZING]
23112317
<dd>Tab Atkins Jr.; Elika Etemad. <a href="http://www.w3.org/TR/css3-sizing/">CSS Intrinsic &amp; Extrinsic Sizing Module Level 3</a>. 27 September 2012. WD. URL: <a href="http://www.w3.org/TR/css3-sizing/">http://www.w3.org/TR/css3-sizing/</a>
23122318
<dt id="biblio-css3-writing-modes"><a class="self-link" href="#biblio-css3-writing-modes"></a>[CSS3-WRITING-MODES]

0 commit comments

Comments
 (0)