Skip to content

Commit bd95758

Browse files
committed
Rebuild layout specs for sizing renames. Round 1: min-size -> min-content
1 parent 01f1481 commit bd95758

5 files changed

Lines changed: 68 additions & 64 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,9 +2459,9 @@ Intrinsic Sizes</h3>
24592459

24602460
<p>
24612461
The <dfn>max-content main size</dfn> of a <i>flex container</i>
2462-
is the sum of the flex container's items' <i>max-size contributions</i> in the <i>main axis</i>.
2462+
is the sum of the flex container's items' <i>max-content contributions</i> in the <i>main axis</i>.
24632463
The <dfn>min-content main size</dfn> of a <i>single-line</i> flex container
2464-
is the sum of the flex container's items' <i>min-size contributions</i> in the <i>main axis</i>;
2464+
is the sum of the flex container's items' <i>min-content contributions</i> in the <i>main axis</i>;
24652465
for a <i>multi-line</i> container,
24662466
it is the largest of those contributions.
24672467

@@ -2471,9 +2471,9 @@ Intrinsic Sizes</h3>
24712471
after performing layout into the given available <i>main-axis</i> space and infinite available <i>cross-axis</i> space.
24722472

24732473
<p>
2474-
The main-size <i title="min-size contribution">min-content</i>/<i>max-size contribution</i> of a <i>flex item</i>
2474+
The main-size <i title="min-content contribution">min-content</i>/<i>max-content contribution</i> of a <i>flex item</i>
24752475
is its outer <i>hypothetical main size</i>
2476-
when sized under a <i title="min-size constraint">min-content</i>/<i>max-size constraint</i> (respectively).
2476+
when sized under a <i title="min-content constraint">min-content</i>/<i>max-content constraint</i> (respectively).
24772477

24782478
<p>
24792479
See [[!CSS3-SIZING]] for a definition of the terms in this section.
@@ -2950,9 +2950,9 @@ Changes since the 18 September 2012 Candidate Recommendation</h3>
29502950
-->
29512951
<p>
29522952
The <i>max-content main size</i> of a <i>flex container</i>
2953-
is the sum of the flex container's items' <i>max-size contributions</i> in the <i>main axis</i>.
2953+
is the sum of the flex container's items' <i>max-content contributions</i> in the <i>main axis</i>.
29542954
The <i>min-content main size</i> of a <i>single-line</i> flex container
2955-
is the sum of the flex container's items' <i>min-size contributions</i> in the <i>main axis</i>;
2955+
is the sum of the flex container's items' <i>min-content contributions</i> in the <i>main axis</i>;
29562956
for a <i>multi-line</i> container,
29572957
it is the largest of those contributions.
29582958

@@ -2963,9 +2963,9 @@ Changes since the 18 September 2012 Candidate Recommendation</h3>
29632963
and infinite available <i>cross-axis</i> space.
29642964

29652965
<p>
2966-
The main-size <i title="min-size contribution">min-content</i>/<i>max-size contribution</i> of a <i>flex item</i>
2966+
The main-size <i title="min-content contribution">min-content</i>/<i>max-content contribution</i> of a <i>flex item</i>
29672967
is its outer <i>hypothetical main size</i>
2968-
when sized under a <i title="min-size constraint">min-content</i>/<i>max-size constraint</i> (respectively).
2968+
when sized under a <i title="min-content constraint">min-content</i>/<i>max-content constraint</i> (respectively).
29692969

29702970
<p>
29712971
See [[!CSS3-SIZING]] for a definition of the terms in this section.</p>

css-flexbox/Overview.html

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
</p>
247247
<h1 class="p-name no-ref" id=title>CSS Flexible Box Layout Module Level 1</h1>
248248
<h2 class="no-num no-toc no-ref heading settled heading" id=subtitle><span class=content>Editor’s Draft,
249-
<span class=dt-updated><span class=value-title title=20140416>16 April 2014</span></span></span></h2>
249+
<span class=dt-updated><span class=value-title title=20140417>17 April 2014</span></span></span></h2>
250250
<div data-fill-with=spec-metadata><dl><dt>This version:<dd><a class=u-url href=http://dev.w3.org/csswg/css-flexbox/>http://dev.w3.org/csswg/css-flexbox/</a><dt>Latest version:<dd><a href=http://www.w3.org/TR/css-flexbox-1/>http://www.w3.org/TR/css-flexbox-1/</a><dt>Editor’s Draft:<dd><a href=http://dev.w3.org/csswg/css-flexbox/>http://dev.w3.org/csswg/css-flexbox/</a><dt>Previous Versions:<dd><a href=http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/ rel=previous>http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-flexbox-20120612/ rel=previous>http://www.w3.org/TR/2012/WD-css3-flexbox-20120612/</a><dd><a href=http://www.w3.org/TR/2012/WD-css3-flexbox-20120322/ rel=previous>http://www.w3.org/TR/2012/WD-css3-flexbox-20120322/</a><dd><a href=http://www.w3.org/TR/2011/WD-css3-flexbox-20111129/ rel=previous>http://www.w3.org/TR/2011/WD-css3-flexbox-20111129/</a><dd><a href=http://www.w3.org/TR/2011/WD-css3-flexbox-20110322/ rel=previous>http://www.w3.org/TR/2011/WD-css3-flexbox-20110322/</a><dd><a href=http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/ rel=previous>http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/</a>
251251
<dt>Feedback:</dt>
252252
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-flexbox%5D%20feedback">www-style@w3.org</a>
@@ -305,7 +305,7 @@ <h2 class="no-num no-toc no-ref heading settled heading" id=contents><span class
305305
<li><a href=#placement><span class=secno>1.2</span> Module interactions</a>
306306
<li><a href=#values><span class=secno>1.3</span> Values</a></ul>
307307
<li><a href=#box-model><span class=secno>2</span> Flex Layout Box Model and Terminology</a>
308-
<li><a href=#flex-containers><span class=secno>3</span> Flex Containers: the <a class=css data-link-type=maybe href=#valuedef-flex title=flex>flex</a> and <a class=css data-link-type=maybe href=#valuedef-inline-flex title=inline-flex>inline-flex</a> <span class=property data-link-type=propdesc title=display>display</span> values</a>
308+
<li><a href=#flex-containers><span class=secno>3</span> Flex Containers: the <span class=css data-link-type=maybe title=flex>flex</span> and <span class=css data-link-type=maybe title=inline-flex>inline-flex</span> <span class=property data-link-type=propdesc title=display>display</span> values</a>
309309
<li><a href=#flex-items><span class=secno>4</span> Flex Items</a>
310310
<ul class=toc>
311311
<li><a href=#abspos-items><span class=secno>4.1</span> Absolutely-Positioned Flex Children</a>
@@ -2461,9 +2461,9 @@ <h3 class="heading settled heading" data-level=9.8 id=intrinsic-sizes><span clas
24612461

24622462
<p>
24632463
The <dfn data-dfn-type=dfn data-noexport="" id=max-content-main-size>max-content main size<a class=self-link href=#max-content-main-size></a></dfn> of a <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>
2464-
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-size-contribution title="max-size contributions">max-size contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>.
2464+
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-content-contribution title="max-content contributions">max-content contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>.
24652465
The <dfn data-dfn-type=dfn data-noexport="" id=min-content-main-size>min-content main size<a class=self-link href=#min-content-main-size></a></dfn> of a <a data-link-type=dfn href=#single-line title=single-line>single-line</a> flex container
2466-
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-size-contribution title="min-size contributions">min-size contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>;
2466+
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-contribution title="min-content contributions">min-content contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>;
24672467
for a <a data-link-type=dfn href=#multi-line title=multi-line>multi-line</a> container,
24682468
it is the largest of those contributions.
24692469

@@ -2473,9 +2473,9 @@ <h3 class="heading settled heading" data-level=9.8 id=intrinsic-sizes><span clas
24732473
after performing layout into the given available <a data-link-type=dfn href=#main-axis title=main-axis>main-axis</a> space and infinite available <a data-link-type=dfn href=#cross-axis title=cross-axis>cross-axis</a> space.
24742474

24752475
<p>
2476-
The main-size <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-size-contribution title="min-size contribution">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-size-contribution title="max-size contribution">max-size contribution</a> of a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a>
2476+
The main-size <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-contribution title="min-content contribution">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-content-contribution title="max-content contribution">max-content contribution</a> of a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a>
24772477
is its outer <a data-link-type=dfn href=#hypothetical-main-size title="hypothetical main size">hypothetical main size</a>
2478-
when sized under a <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-size-constraint title="min-size constraint">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-size-constraint title="max-size constraint">max-size constraint</a> (respectively).
2478+
when sized under a <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-constraint title="min-content constraint">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-content-constraint title="max-content constraint">max-content constraint</a> (respectively).
24792479

24802480
<p>
24812481
See <a data-biblio-type=normative data-link-type=biblio href=#css3-sizing title=css3-sizing>[CSS3-SIZING]</a> for a definition of the terms in this section.
@@ -2949,9 +2949,9 @@ <h3 class="heading settled heading" id=changes-2012><span class=content>
29492949

29502950
<p>
29512951
The <a data-link-type=dfn href=#max-content-main-size title="max-content main size">max-content main size</a> of a <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>
2952-
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-size-contribution title="max-size contributions">max-size contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>.
2952+
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-content-contribution title="max-content contributions">max-content contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>.
29532953
The <a data-link-type=dfn href=#min-content-main-size title="min-content main size">min-content main size</a> of a <a data-link-type=dfn href=#single-line title=single-line>single-line</a> flex container
2954-
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-size-contribution title="min-size contributions">min-size contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>;
2954+
is the sum of the flex container’s items' <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-contribution title="min-content contributions">min-content contributions</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>;
29552955
for a <a data-link-type=dfn href=#multi-line title=multi-line>multi-line</a> container,
29562956
it is the largest of those contributions.
29572957

@@ -2962,9 +2962,9 @@ <h3 class="heading settled heading" id=changes-2012><span class=content>
29622962
and infinite available <a data-link-type=dfn href=#cross-axis title=cross-axis>cross-axis</a> space.
29632963

29642964
<p>
2965-
The main-size <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-size-contribution title="min-size contribution">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-size-contribution title="max-size contribution">max-size contribution</a> of a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a>
2965+
The main-size <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-contribution title="min-content contribution">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-content-contribution title="max-content contribution">max-content contribution</a> of a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a>
29662966
is its outer <a data-link-type=dfn href=#hypothetical-main-size title="hypothetical main size">hypothetical main size</a>
2967-
when sized under a <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-size-constraint title="min-size constraint">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-size-constraint title="max-size constraint">max-size constraint</a> (respectively).
2967+
when sized under a <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-constraint title="min-content constraint">min-content</a>/<a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#max-content-constraint title="max-content constraint">max-content constraint</a> (respectively).
29682968

29692969
<p>
29702970
See <a data-biblio-type=normative data-link-type=biblio href=#css3-sizing title=css3-sizing>[CSS3-SIZING]</a> for a definition of the terms in this section.</p>

0 commit comments

Comments
 (0)