Skip to content

Commit a60f265

Browse files
committed
[css-flexbox] mark a bunch of terms for export
1 parent e01172b commit a60f265

2 files changed

Lines changed: 65 additions & 51 deletions

File tree

css-flexbox/Overview.html

Lines changed: 54 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<meta content="CSS Flexible Box Layout Module" name=dcterms.title>
1313
<meta content=text name=dcterms.type>
14-
<meta content=2013-08-07 name=dcterms.date>
14+
<meta content=2013-08-19 name=dcterms.date>
1515
<meta content="Tab Atkins Jr." name=dcterms.creator>
1616
<meta content="Elika J. Etemad" name=dcterms.creator>
1717
<meta content="Rossen Atanassov" name=dcterms.creator>
@@ -224,11 +224,11 @@
224224
<h1 class=p-name id=head-box-flexible>CSS Flexible Box Layout Module</h1>
225225

226226
<h2 class="no-num no-toc" id=w3c-working>Editor's Draft, <time
227-
class=dt-updated datetime=20130807> 7 August 2013</time></h2>
227+
class=dt-updated datetime=20130819>19 August 2013</time></h2>
228228

229229
<dl>
230230
<dt>This version:
231-
<!--<dd><a class="u-url" href="http://dev.w3.org/csswg/css3-flexbox/">http://www.w3.org/TR/2013/CR-css3-flexbox-20130807/</a>-->
231+
<!--<dd><a class="u-url" href="http://dev.w3.org/csswg/css3-flexbox/">http://www.w3.org/TR/2013/CR-css3-flexbox-20130819/</a>-->
232232

233233
<dd><a class=u-url
234234
href="http://dev.w3.org/csswg/css3-flexbox/">http://dev.w3.org/csswg/css3-flexbox/</a>
@@ -587,9 +587,9 @@ <h2 id=intro><span class=secno>1. </span> Introduction</h2>
587587
regard for other elements in the document
588588
</ul>
589589

590-
<p> This module introduces a new layout mode, <dfn id=flex-layout>flex
591-
layout</dfn>, which is designed for laying out more complex applications
592-
and webpages.
590+
<p> This module introduces a new layout mode, <dfn data-export=data-export
591+
id=flex-layout>flex layout</dfn>, which is designed for laying out more
592+
complex applications and webpages.
593593

594594
<h3 id=overview><span class=secno>1.1. </span> Overview</h3>
595595

@@ -802,14 +802,15 @@ <h2 id=box-model><span class=secno>2. </span> Flex Layout Box Model and
802802
<a href="#flex-flow-row"><code class=css>row</code></a>’ flex
803803
container. </figcaption> </figure>
804804

805-
<dl id=main>
806-
<dt class=axis title="main axis|main-axis">main axis
805+
<dl data-export=data-export id=main>
806+
<dt class=axis>main axis
807807

808808
<dt class=axis>main dimension
809809

810-
<dd> The <dfn id=main-axis>main axis</dfn> of a flex container is the
811-
primary axis along which <a href="#flex-item"><i>flex items</i></a> are
812-
laid out. It extends in the <dfn id=main-dimension>main dimension</dfn>.
810+
<dd> The <dfn id=main-axis title="main axis|main-axis">main axis</dfn> of
811+
a flex container is the primary axis along which <a
812+
href="#flex-item"><i>flex items</i></a> are laid out. It extends in the
813+
<dfn id=main-dimension>main dimension</dfn>.
813814

814815
<dt class=side>main-start
815816

@@ -833,14 +834,15 @@ <h2 id=box-model><span class=secno>2. </span> Flex Layout Box Model and
833834
href="#main-dimension"><i>main dimension</i></a>.
834835
</dl>
835836

836-
<dl id=cross>
837-
<dt class=axis title="cross axis|cross-axis">cross axis
837+
<dl data-export=data-export id=cross>
838+
<dt class=axis>cross axis
838839

839840
<dt class=axis>cross dimension
840841

841842
<dd> The axis perpendicular to the <a href="#main-axis"><i>main
842-
axis</i></a> is called the <dfn id=cross-axis>cross axis</dfn>. It
843-
extends in the <dfn id=cross-dimension>cross dimension</dfn>.
843+
axis</i></a> is called the <dfn id=cross-axis
844+
title="cross axis|cross-axis">cross axis</dfn>. It extends in the <dfn
845+
id=cross-dimension>cross dimension</dfn>.
844846

845847
<dt class=side>cross-start
846848

@@ -894,7 +896,8 @@ <h2 id=flex-containers><span class=secno>3. </span> Flex Containers: the <a
894896
href="#flex-container"><i>flex container</i></a> box.
895897
</dl>
896898

897-
<p> A <dfn id=flex-container>flex container</dfn> establishes a new <dfn
899+
<p> A <dfn data-export=data-export id=flex-container>flex container</dfn>
900+
establishes a new <dfn data-export=data-export
898901
id=flex-formatting-context>flex formatting context</dfn> for its contents.
899902
This is the same as establishing a block formatting context, except that
900903
flex layout is used instead of block layout: floats do not intrude into
@@ -946,13 +949,13 @@ <h2 id=flex-containers><span class=secno>3. </span> Flex Containers: the <a
946949
<h2 id=flex-items><span class=secno>4. </span> Flex Items</h2>
947950

948951
<p> The contents of a <a href="#flex-container"><i>flex container</i></a>
949-
consists of zero or more <dfn id=flex-item title="flex item">flex
950-
items</dfn>: each in-flow child of a <a href="#flex-container"><i>flex
951-
container</i></a> becomes a <a href="#flex-item"><i>flex item</i></a>, and
952-
each contiguous run of text that is directly contained inside a <a
953-
href="#flex-container"><i>flex container</i></a> is wrapped in an
954-
anonymous <a href="#flex-item"><i>flex item</i></a>. However, an anonymous
955-
flex item that contains only <a
952+
consists of zero or more <dfn data-export=data-export id=flex-item
953+
title="flex item">flex items</dfn>: each in-flow child of a <a
954+
href="#flex-container"><i>flex container</i></a> becomes a <a
955+
href="#flex-item"><i>flex item</i></a>, and each contiguous run of text
956+
that is directly contained inside a <a href="#flex-container"><i>flex
957+
container</i></a> is wrapped in an anonymous <a href="#flex-item"><i>flex
958+
item</i></a>. However, an anonymous flex item that contains only <a
956959
href="http://www.w3.org/TR/CSS21/text.html#white-space-prop">white
957960
space</a> is not rendered, as if it were ‘<code
958961
class=css>display:none</code>’.
@@ -1461,9 +1464,9 @@ <h3 id=flex-wrap-property><span class=secno>5.2. </span> Flex Line
14611464
<p> The ‘<a href="#flex-wrap"><code
14621465
class=property>flex-wrap</code></a>’ property controls whether the flex
14631466
container is <a href="#single-line"><i>single-line</i></a> or <a
1464-
href="#multi-line"><i>multi-line</i></a>, and the direction of the
1465-
<i>cross-axis</i>, which determines the direction new lines are stacked
1466-
in.
1467+
href="#multi-line"><i>multi-line</i></a>, and the direction of the <a
1468+
href="#cross-axis"><i>cross-axis</i></a>, which determines the direction
1469+
new lines are stacked in.
14671470

14681471
<dl>
14691472
<dt><dfn id=flex-flow-nowrap><code class=css>nowrap</code></dfn>
@@ -2854,10 +2857,12 @@ <h3 id=align-content-property><span class=secno>8.4. </span> Packing Flex
28542857
<p> The ‘<a href="#align-content"><code
28552858
class=property>align-content</code></a>’ property aligns a flex
28562859
container's lines within the flex container when there is extra space in
2857-
the <i>cross-axis</i>, similar to how ‘<a href="#justify-content"><code
2858-
class=property>justify-content</code></a>’ aligns individual items
2859-
within the <i>main-axis</i>. Note, this property has no effect when the
2860-
flex container has only a single line. Values have the following meanings:
2860+
the <a href="#cross-axis"><i>cross-axis</i></a>, similar to how ‘<a
2861+
href="#justify-content"><code class=property>justify-content</code></a>
2862+
aligns individual items within the <a
2863+
href="#main-axis"><i>main-axis</i></a>. Note, this property has no effect
2864+
when the flex container has only a single line. Values have the following
2865+
meanings:
28612866

28622867
<dl>
28632868
<dt><dfn id=align-content-flex-start><code
@@ -2929,9 +2934,9 @@ <h3 id=align-content-property><span class=secno>8.4. </span> Packing Flex
29292934
</dl>
29302935

29312936
<p class=note> Note: Only flex containers with multiple lines ever have
2932-
free space in the <i>cross-axis</i> for lines to be aligned in, because in
2933-
a flex container with a single line the sole line automatically stretches
2934-
to fill the space.
2937+
free space in the <a href="#cross-axis"><i>cross-axis</i></a> for lines to
2938+
be aligned in, because in a flex container with a single line the sole
2939+
line automatically stretches to fill the space.
29352940

29362941
<div class=figure> <img alt=alt height=508
29372942
src="images/align-content-example.svg" width=612>
@@ -2947,7 +2952,8 @@ <h3 id=flex-baselines><span class=secno>8.5. </span> Flex Baselines</h3>
29472952
class=property>order</code></a>’):
29482953

29492954
<dl>
2950-
<dt><dfn id=main-axis-baseline>main-axis baseline</dfn>
2955+
<dt><dfn data-export=data-export id=main-axis-baseline>main-axis
2956+
baseline</dfn>
29512957

29522958
<dd>
29532959
<ol>
@@ -2977,7 +2983,8 @@ <h3 id=flex-baselines><span class=secno>8.5. </span> Flex Baselines</h3>
29772983
-->
29782984
</ol>
29792985

2980-
<dt><dfn id=cross-axis-baseline>cross-axis baseline</dfn>
2986+
<dt><dfn data-export=data-export id=cross-axis-baseline>cross-axis
2987+
baseline</dfn>
29812988

29822989
<dd>
29832990
<ol>
@@ -3452,8 +3459,9 @@ <h3 id=intrinsic-sizes><span class=secno>9.8. </span> Intrinsic Sizes</h3>
34523459

34533460
<p> The <i>min-content cross size</i> and <i>max-content cross size</i> of
34543461
a flex container are the cross size of the flex container after performing
3455-
layout into the given available <i>main-axis</i> space and infinite
3456-
available <i>cross-axis</i> space.
3462+
layout into the given available <a href="#main-axis"><i>main-axis</i></a>
3463+
space and infinite available <a href="#cross-axis"><i>cross-axis</i></a>
3464+
space.
34573465

34583466
<p> The main-size <i
34593467
title="min-content contribution">min-content</i>/<i>max-content
@@ -3987,10 +3995,10 @@ <h3 class=no-num id=informative>Other references</h3>
39873995
<dt id=CSS3VAL>[CSS3VAL]
39883996

39893997
<dd>Håkon Wium Lie; Tab Atkins; Elika J. Etemad. <a
3990-
href="http://www.w3.org/TR/2013/CR-css3-values-20130404/"><cite>CSS
3991-
Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate
3998+
href="http://www.w3.org/TR/2013/CR-css3-values-20130730/"><cite>CSS
3999+
Values and Units Module Level 3.</cite></a> 30 July 2013. W3C Candidate
39924000
Recommendation. (Work in progress.) URL: <a
3993-
href="http://www.w3.org/TR/2013/CR-css3-values-20130404/">http://www.w3.org/TR/2013/CR-css3-values-20130404/</a>
4001+
href="http://www.w3.org/TR/2013/CR-css3-values-20130730/">http://www.w3.org/TR/2013/CR-css3-values-20130730/</a>
39944002
</dd>
39954003
<!---->
39964004

@@ -4335,6 +4343,9 @@ <h2 class=no-num id=index>Index</h2>
43354343
<li>cross axis, <a href="#cross-axis"
43364344
title="section 2."><strong>2.</strong></a>
43374345

4346+
<li>cross-axis, <a href="#cross-axis"
4347+
title="section 2."><strong>2.</strong></a>
4348+
43384349
<li>cross-axis baseline, <a href="#cross-axis-baseline"
43394350
title="section 8.5."><strong>8.5.</strong></a>
43404351

@@ -4449,6 +4460,9 @@ <h2 class=no-num id=index>Index</h2>
44494460
<li>main axis, <a href="#main-axis"
44504461
title="section 2."><strong>2.</strong></a>
44514462

4463+
<li>main-axis, <a href="#main-axis"
4464+
title="section 2."><strong>2.</strong></a>
4465+
44524466
<li>main-axis baseline, <a href="#main-axis-baseline"
44534467
title="section 8.5."><strong>8.5.</strong></a>
44544468

css-flexbox/Overview.src.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ <h2 id="intro">
302302
<li>positioned layout, designed for very explicit positioning without much regard for other elements in the document
303303
</ul>
304304
<p>
305-
This module introduces a new layout mode, <dfn>flex layout</dfn>,
305+
This module introduces a new layout mode, <dfn data-export>flex layout</dfn>,
306306
which is designed for laying out more complex applications and webpages.
307307

308308
<h3 id="overview">
@@ -491,11 +491,11 @@ <h2 id='box-model'>
491491
</figcaption>
492492
</figure>
493493

494-
<dl id="main">
495-
<dt class='axis' title="main axis|main-axis">main axis
494+
<dl id="main" data-export>
495+
<dt class='axis'>main axis
496496
<dt class='axis'>main dimension
497497
<dd>
498-
The <dfn>main axis</dfn> of a flex container is the primary axis along which <i>flex items</i> are laid out.
498+
The <dfn title="main axis|main-axis">main axis</dfn> of a flex container is the primary axis along which <i>flex items</i> are laid out.
499499
It extends in the <dfn>main dimension</dfn>.
500500

501501
<dt class='side'>main-start
@@ -516,11 +516,11 @@ <h2 id='box-model'>
516516
whichever is in the <i>main dimension</i>.
517517
</dl>
518518

519-
<dl id="cross">
520-
<dt class='axis' title="cross axis|cross-axis">cross axis
519+
<dl id="cross" data-export>
520+
<dt class='axis'>cross axis
521521
<dt class='axis'>cross dimension
522522
<dd>
523-
The axis perpendicular to the <i>main axis</i> is called the <dfn>cross axis</dfn>.
523+
The axis perpendicular to the <i>main axis</i> is called the <dfn title="cross axis|cross-axis">cross axis</dfn>.
524524
It extends in the <dfn>cross dimension</dfn>.
525525

526526
<dt class='side'>cross-start
@@ -563,7 +563,7 @@ <h2 id='flex-containers'>
563563
</dl>
564564

565565
<p>
566-
A <dfn>flex container</dfn> establishes a new <dfn>flex formatting context</dfn> for its contents.
566+
A <dfn data-export>flex container</dfn> establishes a new <dfn data-export>flex formatting context</dfn> for its contents.
567567
This is the same as establishing a block formatting context,
568568
except that flex layout is used instead of block layout:
569569
floats do not intrude into the flex container,
@@ -607,7 +607,7 @@ <h2 id='flex-items'>
607607
Flex Items</h2>
608608

609609
<p>
610-
The contents of a <i>flex container</i> consists of zero or more <dfn title="flex item" id="flex-item">flex items</dfn>:
610+
The contents of a <i>flex container</i> consists of zero or more <dfn data-export title="flex item" id="flex-item">flex items</dfn>:
611611
each in-flow child of a <i>flex container</i>
612612
becomes a <i>flex item</i>,
613613
and each contiguous run of text that is directly contained inside a <i>flex container</i>
@@ -2211,7 +2211,7 @@ <h3 id="flex-baselines">
22112211
The baselines of a flex container are determined as follows (after reordering with 'order'):
22122212

22132213
<dl>
2214-
<dt><dfn>main-axis baseline</dfn>
2214+
<dt><dfn data-export>main-axis baseline</dfn>
22152215
<dd>
22162216
<ol>
22172217
<li>
@@ -2238,7 +2238,7 @@ <h3 id="flex-baselines">
22382238
-->
22392239
</ol>
22402240

2241-
<dt><dfn>cross-axis baseline</dfn>
2241+
<dt><dfn data-export>cross-axis baseline</dfn>
22422242
<dd>
22432243
<ol>
22442244
<li>

0 commit comments

Comments
 (0)