Skip to content

Commit 728b51b

Browse files
committed
[css-flexbox] Fix Ins/Del markup. Add in missing change diff.
1 parent 8af03d6 commit 728b51b

2 files changed

Lines changed: 32 additions & 30 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3179,7 +3179,7 @@ Substantive Changes and Bugfixes</h4>
31793179
<a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-30">30</a>)
31803180

31813181
<blockquote>
3182-
On a <a>flex item</a> whose 'overflow' is <del>not</del> ''overflow/visible'' <ins>in the <i>main axis</i></ins>,
3182+
<p>On a <a>flex item</a> whose 'overflow' is <del>not</del> ''overflow/visible'' <ins>in the <i>main axis</i></ins>,
31833183
</blockquote>
31843184

31853185
<li id="change-201403-min-auto-ratio">
@@ -3192,7 +3192,7 @@ Substantive Changes and Bugfixes</h4>
31923192
<p>On a <a>flex item</a> whose 'overflow' is not ''overflow/visible'',
31933193
<ins>the following table gives the minimum size:
31943194
<a href="#valdef-min-width-min-height-auto"><strong>[see table]</strong></a></ins><br>
3195-
<del>this keyword specifies as the minimum size the smaller of:</del>
3195+
<del>this keyword specifies as the minimum size the smaller of:</del></p>
31963196
<del>
31973197
<ul>
31983198
<li>the <a>min-content size</a>, or
@@ -3232,9 +3232,6 @@ Substantive Changes and Bugfixes</h4>
32323232
could each be explicitly specified.
32333233
(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-20">20</a>)
32343234

3235-
Note: This change is open for feedback from implementers,
3236-
and an alternative solution is also described if the current one is deemed unworkable.
3237-
32383235
<li id="change-201403-definite-flexing">
32393236
Defined <i>flex items</i> with a <i>definite</i> <i>flex basis</i>
32403237
to also be <i>definite</i> in the <i>main axis</i>,
@@ -3352,6 +3349,11 @@ Clarifications</h4>
33523349
Clarified what a <i>stretched</i> flex item is
33533350
for the purposes of special behavior (like definiteness).
33543351
(Issue <a href="http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-25">25</a>)
3352+
<blockquote>
3353+
<p>If the cross size property of the flex item computes to auto,
3354+
<ins>and either of the cross-axis margins are auto, the flex item is stretched. Its</ins>
3355+
<del>its</del> used value &hellip;
3356+
</blockquote>
33553357
</ul>
33563358

33573359
<h3 id="changes-2012">

css-flexbox/Overview.html

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3044,7 +3044,7 @@ <h4 class="heading settled" id=change-201403-substantive><span class=content>
30443044
<a href=http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-30>30</a>)
30453045

30463046
<blockquote>
3047-
On a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a> whose <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css-overflow-3/#overflow title=overflow>overflow</a> is <del>not</del> <span class=css data-link-for=overflow>visible</span> <ins>in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a></ins>,
3047+
<p>On a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a> whose <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css-overflow-3/#overflow title=overflow>overflow</a> is <del>not</del> <span class=css data-link-for=overflow>visible</span> <ins>in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a></ins>,
30483048
</blockquote>
30493049

30503050
<li id=change-201403-min-auto-ratio><a class=self-link href=#change-201403-min-auto-ratio></a>
@@ -3057,13 +3057,13 @@ <h4 class="heading settled" id=change-201403-substantive><span class=content>
30573057
<p>On a <a data-link-type=dfn href=#flex-item title="flex item">flex item</a> whose <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css-overflow-3/#overflow title=overflow>overflow</a> is not <span class=css data-link-for=overflow>visible</span>,
30583058
<ins>the following table gives the minimum size:
30593059
<a href=#valdef-min-width-min-height-auto><strong>[see table]</strong></a></ins><br>
3060-
<del>this keyword specifies as the minimum size the smaller of:</del>
3060+
<del>this keyword specifies as the minimum size the smaller of:</del></p>
30613061
<del>
3062-
</del><ul>
3062+
<ul>
30633063
<li>the <a data-link-type=dfn href=http://dev.w3.org/csswg/css-sizing-3/#min-content-inline-size title="min-content size">min-content size</a>, or
30643064
<li>the computed <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-width title=width>width</a>/<a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-height title=height>height</a>, if that value is <a data-link-type=dfn href=#definite title=definite>definite</a>.
30653065
</ul>
3066-
3066+
</del>
30673067
</blockquote>
30683068

30693069
<li id=change-201403-min-auto-main-size-basis><a class=self-link href=#change-201403-min-auto-main-size-basis></a>
@@ -3082,13 +3082,14 @@ <h4 class="heading settled" id=change-201403-substantive><span class=content>
30823082
is not consulted when percentage-sizing any of its contents.
30833083
(Issue <a href=http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-27>27</a>)
30843084
<blockquote>
3085-
<p>In order to prevent cycling sizing,
3085+
3086+
<ins><p>In order to prevent cycling sizing,
30863087
the <a class=css data-link-type=maybe href=#valdef-min-width-min-height-auto title=auto>auto</a> value of <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-min-height title=min-height>min-height</a> and <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-max-height title=max-height>max-height</a>
30873088
does not factor into the percentage size resolution of the box’s contents.
30883089
For example, a percentage-height block whose flex item parent has
30893090
<a class=css data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-height title=height>height: 120em; min-height: auto</a>
30903091
will size itself against <a class=css data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-height title=height>height: 120em</a> regardless of the impact
3091-
that <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-min-height title=min-height>min-height</a> might have on the used size of the flex item.
3092+
that <a class=property data-link-type=propdesc href=http://www.w3.org/TR/CSS21/visudet.html#propdef-min-height title=min-height>min-height</a> might have on the used size of the flex item.</ins>
30923093
</blockquote>
30933094

30943095
<li id=change-201403-flex-basis-auto><a class=self-link href=#change-201403-flex-basis-auto></a>
@@ -3097,9 +3098,6 @@ <h4 class="heading settled" id=change-201403-substantive><span class=content>
30973098
could each be explicitly specified.
30983099
(Issue <a href=http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-20>20</a>)
30993100

3100-
<p class=note>Note: This change is open for feedback from implementers,
3101-
and an alternative solution is also described if the current one is deemed unworkable.</p>
3102-
31033101
<li id=change-201403-definite-flexing><a class=self-link href=#change-201403-definite-flexing></a>
31043102
Defined <a data-link-type=dfn href=#flex-item title="flex items">flex items</a> with a <a data-link-type=dfn href=#definite title=definite>definite</a> <a data-link-type=dfn href=#flex-basis title="flex basis">flex basis</a>
31053103
to also be <a data-link-type=dfn href=#definite title=definite>definite</a> in the <a data-link-type=dfn href=#main-axis title="main axis">main axis</a>,
@@ -3108,12 +3106,14 @@ <h4 class="heading settled" id=change-201403-substantive><span class=content>
31083106
(Issue <a href=http://dev.w3.org/csswg/css-flexbox-1/issues-lc-20140325#issue-26>26</a>)
31093107

31103108
<blockquote>
3111-
<p>If a percentage is going to be resolved against a flex item’s main size,
3112-
and the flex item has a definite flex basis,
3113-
the main size must be treated as definite for the purpose of resolving the percentage,
3114-
and the percentage must resolve against the flexed main size of the flex item
3115-
(that is, after the layout algorithm below has been completed for the flex item’s flex container,
3116-
and the flex item has acquired its final size).
3109+
<ins>
3110+
<p>If a percentage is going to be resolved against a flex item’s main size,
3111+
and the flex item has a definite flex basis,
3112+
the main size must be treated as definite for the purpose of resolving the percentage,
3113+
and the percentage must resolve against the flexed main size of the flex item
3114+
(that is, after the layout algorithm below has been completed for the flex item’s flex container,
3115+
and the flex item has acquired its final size).
3116+
</ins>
31173117
</blockquote>
31183118

31193119
<li id=change-201403-clamp-single-line><a class=self-link href=#change-201403-clamp-single-line></a>
@@ -3178,14 +3178,14 @@ <h4 class="heading settled" id=change-201403-clarify><span class=content>
31783178
then positioning each absolutely-positioned child</del>
31793179
<ins>determined such that the child is positioned</ins>
31803180
as if it were the sole flex item in the flex container,
3181-
assuming both the child and the flex container were fixed-size boxes of their used size.
3181+
assuming both the child and the flex container were fixed-size boxes of their used size.</p>
31823182

3183-
<ins></ins><p>In other words, the static position of an absolutely positioned child of a flex container
3183+
<ins><p>In other words, the static position of an absolutely positioned child of a flex container
31843184
is determined <em>after flex layout</em>
31853185
by setting the child’s <a data-link-type=dfn href=#static-position-rectangle title="static-position rectangle">static-position rectangle</a> to the flex container’s content box,
31863186
then aligning the absolutely positioned child within this rectangle
31873187
according to the <a class=property data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content</a> value of the flex container and the <a class=property data-link-type=propdesc href=#propdef-align-self title=align-self>align-self</a> value of the child itself.
3188-
3188+
</ins>
31893189
</blockquote>
31903190

31913191
<li id=change-201403-abspos-ordering><a class=self-link href=#change-201403-abspos-ordering></a>
@@ -3426,10 +3426,10 @@ <h4 class="heading settled" id=changes-2014-substantive><span class=content>
34263426
(<a href=http://dev.w3.org/csswg/css-flexbox-1/issues-cr-2012#issue-6>Issue 6</a>)
34273427
<blockquote>
34283428
<p>An absolutely-positioned child of a <a data-link-type=dfn href=#flex-container title="flex container">flex container</a> does not participate in flex layout
3429-
beyond the <a href=#algo-flex-order>reordering step</a>.
3429+
beyond the <a href=#algo-flex-order>reordering step</a>.</p>
34303430

34313431
<del>
3432-
</del><p>
3432+
<p>
34333433
However, if both <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css3-positioning/#left title=left>left</a> and <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css3-positioning/#right title=right>right</a> or both <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css3-positioning/#top title=top>top</a> and <a class=property data-link-type=propdesc href=http://www.w3.org/TR/css3-positioning/#bottom title=bottom>bottom</a> are <a class=css data-link-type=maybe href=#valdef-min-width-min-height-auto title=auto>auto</a>,
34343434
then the used value of those properties
34353435
are computed from its static position, as follows:
@@ -3485,10 +3485,10 @@ <h4 class="heading settled" id=changes-2014-substantive><span class=content>
34853485
<a class=css data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content: space-around</a> or <a class=css data-link-type=propdesc href=#propdef-justify-content title=justify-content>justify-content: space-between</a>
34863486
are suppressed around the hypothetical item:
34873487
between it and the next item if there is a real item after it,
3488-
else between it and the previous item (if any) if there isn’t.
3489-
3488+
else between it and the previous item (if any) if there isn’t.</p>
3489+
</del>
34903490
<ins>
3491-
</ins><p>Its static position is calculated by first doing full flex layout
3491+
<p>Its static position is calculated by first doing full flex layout
34923492
without the absolutely-positioned children,
34933493
then positioning each absolutely-positioned child
34943494
as if it were the sole <a data-link-type=dfn href=#flex-item title="flex item">flex item</a> in the <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>,
@@ -3501,7 +3501,7 @@ <h4 class="heading settled" id=changes-2014-substantive><span class=content>
35013501
Setting <span class=css>justify-content:center</span> on the <a data-link-type=dfn href=#flex-container title="flex container">flex container</a>, however,
35023502
would center it in the main axis.
35033503
</div>
3504-
3504+
</ins>
35053505
</blockquote>
35063506
<li id=change-2012-flex-continuity><a class=self-link href=#change-2012-flex-continuity></a>
35073507
Changed algorithm for <a href=#resolve-flexible-lengths>resolving flexible lengths</a>
@@ -3940,4 +3940,4 @@ <h2 class="no-num heading settled" id=issues-index><span class=content>Issues In
39403940
<p>The CSSWG is waiting for feedback from implementers on this issue.</p>
39413941

39423942
<p><small><sup>1</sup> Alternate keyword suggestions welcome.</small></p>
3943-
<a href=#issue-753aff05></a></div></div>
3943+
<a href=#issue-753aff05></a></div></div>

0 commit comments

Comments
 (0)