Skip to content

Commit 828117a

Browse files
committed
[css-flexbox] Fix ins/del markup.
1 parent c833780 commit 828117a

File tree

2 files changed

+26
-18
lines changed

2 files changed

+26
-18
lines changed

css-flexbox/Overview.bs

+15-7
Original file line numberDiff line numberDiff line change
@@ -3157,6 +3157,16 @@ Eugene Veselov,
31573157
Greg Whitworth,
31583158
Boris Zbarsky.
31593159

3160+
<!--
3161+
██████ ██ ██ ███ ██ ██ ██████ ████████ ██████
3162+
██ ██ ██ ██ ██ ██ ███ ██ ██ ██ ██ ██ ██
3163+
██ ██ ██ ██ ██ ████ ██ ██ ██ ██
3164+
██ █████████ ██ ██ ██ ██ ██ ██ ████ ██████ ██████
3165+
██ ██ ██ █████████ ██ ████ ██ ██ ██ ██
3166+
██ ██ ██ ██ ██ ██ ██ ███ ██ ██ ██ ██ ██
3167+
██████ ██ ██ ██ ██ ██ ██ ██████ ████████ ██████
3168+
-->
3169+
31603170
<h2 class="no-num" id="changes">Changes</h2>
31613171

31623172
<h3 id="changes-201403">
@@ -3314,19 +3324,17 @@ Clarifications</h4>
33143324

33153325
<blockquote>
33163326
<p><del>Its</del> <ins>The</ins> static position <ins>of an absolutely-positioned child of a flex container</ins>
3317-
is
3318-
<del>calculated by first doing full flex layout without the absolutely-positioned children,
3327+
is <del>calculated by first doing full flex layout without the absolutely-positioned children,
33193328
then positioning each absolutely-positioned child</del>
33203329
<ins>determined such that the child is positioned</ins>
33213330
as if it were the sole flex item in the flex container,
33223331
assuming both the child and the flex container were fixed-size boxes of their used size.
33233332

3324-
<ins><p>In other words, the static position of an absolutely positioned child of a flex container
3333+
<p><ins>In other words, the static position of an absolutely positioned child of a flex container
33253334
is determined <em>after flex layout</em>
33263335
by setting the child’s <i>static-position rectangle</i> to the flex container’s content box,
33273336
then aligning the absolutely positioned child within this rectangle
3328-
according to the 'justify-content' value of the flex container and the 'align-self' value of the child itself.
3329-
</ins>
3337+
according to the 'justify-content' value of the flex container and the 'align-self' value of the child itself.</ins>
33303338
</blockquote>
33313339

33323340
<li id="change-201403-abspos-ordering">
@@ -3578,7 +3586,7 @@ Substantive Changes and Bugfixes</h4>
35783586
Simplified the static position of abspos children of <a>flex containers</a> to be consistent with Grid Layout.
35793587
(<a href="http://dev.w3.org/csswg/css-flexbox-1/issues-cr-2012#issue-6">Issue 6</a>)
35803588
<blockquote>
3581-
<p>An absolutely-positioned child of a <i>flex container</i> does not participate in flex layout
3589+
An absolutely-positioned child of a <i>flex container</i> does not participate in flex layout
35823590
beyond the <a href="#algo-flex-order">reordering step</a>.
35833591

35843592
<del>
@@ -3638,7 +3646,7 @@ Substantive Changes and Bugfixes</h4>
36383646
''justify-content: space-around'' or ''justify-content: space-between''
36393647
are suppressed around the hypothetical item:
36403648
between it and the next item if there is a real item after it,
3641-
else between it and the previous item (if any) if there isn't.
3649+
else between it and the previous item (if any) if there isn't.</p>
36423650
</del>
36433651
<ins>
36443652
<p>Its static position is calculated by first doing full flex layout

css-flexbox/Overview.html

+11-11
Original file line numberDiff line numberDiff line change
@@ -2969,6 +2969,8 @@ <h2 class="no-num heading settled" id=acknowledgments><span class=content>Acknow
29692969
Greg Whitworth,
29702970
Boris Zbarsky.</p>
29712971

2972+
2973+
29722974
<h2 class="no-num heading settled" id=changes><span class=content>Changes</span><a class=self-link href=#changes></a></h2>
29732975

29742976
<h3 class="heading settled" id=changes-201403><span class=content>
@@ -3126,19 +3128,17 @@ <h4 class="heading settled" id=change-201403-clarify><span class=content>
31263128

31273129
<blockquote>
31283130
<p><del>Its</del> <ins>The</ins> static position <ins>of an absolutely-positioned child of a flex container</ins>
3129-
is
3130-
<del>calculated by first doing full flex layout without the absolutely-positioned children,
3131+
is <del>calculated by first doing full flex layout without the absolutely-positioned children,
31313132
then positioning each absolutely-positioned child</del>
31323133
<ins>determined such that the child is positioned</ins>
31333134
as if it were the sole flex item in the flex container,
31343135
assuming both the child and the flex container were fixed-size boxes of their used size.
31353136

3136-
<ins></ins><p>In other words, the static position of an absolutely positioned child of a flex container
3137+
<p><ins>In other words, the static position of an absolutely positioned child of a flex container
31373138
is determined <em>after flex layout</em>
31383139
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,
31393140
then aligning the absolutely positioned child within this rectangle
3140-
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.
3141-
3141+
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.</ins>
31423142
</blockquote>
31433143

31443144
<li id=change-201403-abspos-ordering><a class=self-link href=#change-201403-abspos-ordering></a>
@@ -3383,11 +3383,11 @@ <h4 class="heading settled" id=changes-2014-substantive><span class=content>
33833383
Simplified the static position of abspos children of <a data-link-type=dfn href=#flex-container title="flex containers">flex containers</a> to be consistent with Grid Layout.
33843384
(<a href=http://dev.w3.org/csswg/css-flexbox-1/issues-cr-2012#issue-6>Issue 6</a>)
33853385
<blockquote>
3386-
<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
3386+
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
33873387
beyond the <a href=#algo-flex-order>reordering step</a>.
33883388

33893389
<del>
3390-
</del><p>
3390+
<p>
33913391
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>,
33923392
then the used value of those properties
33933393
are computed from its static position, as follows:
@@ -3443,10 +3443,10 @@ <h4 class="heading settled" id=changes-2014-substantive><span class=content>
34433443
<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>
34443444
are suppressed around the hypothetical item:
34453445
between it and the next item if there is a real item after it,
3446-
else between it and the previous item (if any) if there isn’t.
3447-
3446+
else between it and the previous item (if any) if there isn’t.</p>
3447+
</del>
34483448
<ins>
3449-
</ins><p>Its static position is calculated by first doing full flex layout
3449+
<p>Its static position is calculated by first doing full flex layout
34503450
without the absolutely-positioned children,
34513451
then positioning each absolutely-positioned child
34523452
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>,
@@ -3459,7 +3459,7 @@ <h4 class="heading settled" id=changes-2014-substantive><span class=content>
34593459
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,
34603460
would center it in the main axis.
34613461
</div>
3462-
3462+
</ins>
34633463
</blockquote>
34643464
<li id=change-2012-flex-continuity><a class=self-link href=#change-2012-flex-continuity></a>
34653465
Changed algorithm for <a href=#resolve-flexible-lengths>resolving flexible lengths</a>

0 commit comments

Comments
 (0)