Skip to content

Commit f69b87e

Browse files
committed
[css-flexbox] What was I smoking? Make the edit from 9954fb9b2adf actually be correct.
1 parent 6e7950d commit f69b87e

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

css-flexbox/Overview.bs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -887,13 +887,17 @@ Implied Minimum Size of Flex Items</h3>
887887
this keyword specifies as the minimum size the smallest of:
888888

889889
<ul>
890-
<li>the used 'flex-basis', if the computed 'flex-basis' was ''flex-basis/main-size'',
890+
<li>the computed 'flex-basis', if that value is <a>definite</a>.
891+
<li>if 'flex-basis' is ''main-size'',
892+
the computed 'width' ('height'),
893+
if that value is <a>definite</a>.
891894
<li>the computed 'max-width' ('max-height'), if that value is <a>definite</a>,
892895
<li>if the item has no intrinsic aspect ratio, its <a>min-content size</a>,
893-
<li>if the item has an intrinsic aspect ratio,
894-
the width (height) calculated from
895-
the aspect ratio and any definite size constraints in the opposite dimension
896-
<span class="issue">Audit this for correctness.</span>
896+
<li>if the item has an intrinsic aspect ratio and a <a>definite</a> 'max-height' ('max-width'),
897+
the width (height) calculated from
898+
the aspect ratio and 'max-height' ('max-width').
899+
<span class="issue">Audit this for correctness.</span>
900+
<li>
897901
</ul>
898902

899903
Otherwise,

css-flexbox/Overview.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,13 +1022,17 @@ <h3 class="heading settled" data-level=4.5 id=min-size-auto><span class=secno>4.
10221022
this keyword specifies as the minimum size the smallest of:
10231023

10241024
<ul>
1025-
<li>the used <a class=property data-link-type=propdesc href=#propdef-flex-basis title=flex-basis>flex-basis</a>, if the computed <a class=property data-link-type=propdesc href=#propdef-flex-basis title=flex-basis>flex-basis</a> was <a class=css data-link-for=flex-basis data-link-type=maybe href=#valdef-flex-basis-main-size title=main-size>main-size</a>,
1025+
<li>the computed <a class=property data-link-type=propdesc href=#propdef-flex-basis title=flex-basis>flex-basis</a>, if that value is <a data-link-type=dfn href=#definite title=definite>definite</a>.
1026+
<li>if <a class=property data-link-type=propdesc href=#propdef-flex-basis title=flex-basis>flex-basis</a> is <a class=css data-link-type=maybe href=#valdef-flex-basis-main-size title=main-size>main-size</a>,
1027+
the computed <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-width title=width>width</a> (<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-height title=height>height</a>),
1028+
if that value is <a data-link-type=dfn href=#definite title=definite>definite</a>.
10261029
<li>the computed <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-max-width title=max-width>max-width</a> (<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-max-height title=max-height>max-height</a>), if that value is <a data-link-type=dfn href=#definite title=definite>definite</a>,
10271030
<li>if the item has no intrinsic aspect ratio, its <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>,
1028-
<li>if the item has an intrinsic aspect ratio,
1029-
the width (height) calculated from
1030-
the aspect ratio and any definite size constraints in the opposite dimension
1031-
<span class=issue id=issue-3e8af8e3><a class=self-link href=#issue-3e8af8e3></a>Audit this for correctness.</span>
1031+
<li>if the item has an intrinsic aspect ratio and a <a data-link-type=dfn href=#definite title=definite>definite</a> <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-max-height title=max-height>max-height</a> (<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-max-width title=max-width>max-width</a>),
1032+
the width (height) calculated from
1033+
the aspect ratio and <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-max-height title=max-height>max-height</a> (<a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css2/visudet.html#propdef-max-width title=max-width>max-width</a>).
1034+
<span class=issue id=issue-3e8af8e3><a class=self-link href=#issue-3e8af8e3></a>Audit this for correctness.</span>
1035+
<li>
10321036
</ul>
10331037

10341038
<p>Otherwise,

0 commit comments

Comments
 (0)