Skip to content

Commit 80fa1f5

Browse files
committed
Remove paragraphs changing the sizing rules with object-fit:contain/cover, per WG decision.
1 parent 72e7c31 commit 80fa1f5

2 files changed

Lines changed: 6 additions & 54 deletions

File tree

css3-images/Overview.html

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,41 +2052,13 @@ <h3 id=object-fit><span class=secno>5.4. </span> Sizing Objects: the
20522052

20532053
<dt>&lsquo;<code class=css>contain</code>&rsquo;
20542054

2055-
<dd>
2056-
<p>Determine the used &lsquo;<code class=property>height</code>&rsquo;
2057-
and &lsquo;<code class=property>width</code>&rsquo; of the element as
2058-
usual, except: If both &lsquo;<code class=property>height</code>&rsquo;
2059-
and &lsquo;<code class=property>width</code>&rsquo; are &lsquo;<code
2060-
class=css>auto</code>&rsquo;, and the used value of at least one of
2061-
&lsquo;<code class=property>max-width</code>&rsquo; and &lsquo;<code
2062-
class=property>max-height</code>&rsquo; is not &lsquo;<code
2063-
class=css>none</code>&rsquo;, then compute the element's used width and
2064-
used height as though the intrinsic dimensions of the contents were
2065-
infinitely large numbers whose ratio is the actual intrinsic ratio of
2066-
the contents. This will proportionally scale the used width and height
2067-
up to the given maximum constraints.</p>
2068-
2069-
<p>The object's <a href="#specified-size"><i>specified size</i></a> is a
2070-
"contain" constraint.</p>
2055+
<dd>The object's <a href="#specified-size"><i>specified size</i></a> is a
2056+
"contain" constraint.
20712057

20722058
<dt>&lsquo;<code class=css>cover</code>&rsquo;
20732059

2074-
<dd>
2075-
<p>Determine the used &lsquo;<code class=property>height</code>&rsquo;
2076-
and &lsquo;<code class=property>width</code>&rsquo; of the element as
2077-
usual, except: If both &lsquo;<code class=property>height</code>&rsquo;
2078-
and &lsquo;<code class=property>width</code>&rsquo; are &lsquo;<code
2079-
class=css>auto</code>&rsquo;, and the used value of at least one of
2080-
&lsquo;<code class=property>min-width</code>&rsquo; and &lsquo;<code
2081-
class=property>min-height</code>&rsquo; is not &lsquo;<code
2082-
class=css>none</code>&rsquo;, then compute the element's used width and
2083-
used height as though the intrinsic dimensions of the contents were
2084-
infinitely small numbers whose ratio is the actual intrinsic ratio of
2085-
the contents. This will proportionally scale the used width and height
2086-
down to the given minimum constraints.</p>
2087-
2088-
<p>The object's <a href="#specified-size"><i>specified size</i></a> is a
2089-
"cover" constraint.</p>
2060+
<dd>The object's <a href="#specified-size"><i>specified size</i></a> is a
2061+
"cover" constraint.
20902062

20912063
<dt>&lsquo;<code class=css>none</code>&rsquo;
20922064

css3-images/Overview.src.html

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,30 +1240,10 @@ <h3 id="object-fit">
12401240
<dd>The object's <i>specified size</i> is the element's used width and height.</dd>
12411241

12421242
<dt>''contain''</dt>
1243-
<dd>
1244-
<p>Determine the used 'height' and 'width' of the element as usual,
1245-
except: If both 'height' and 'width' are ''auto'', and the used value of
1246-
at least one of 'max-width' and 'max-height' is not ''none'', then compute
1247-
the element's used width and used height as though the intrinsic
1248-
dimensions of the contents were infinitely large numbers whose ratio
1249-
is the actual intrinsic ratio of the contents. This will proportionally
1250-
scale the used width and height up to the given maximum constraints.</p>
1251-
1252-
<p>The object's <i>specified size</i> is a "contain" constraint.</p>
1253-
</dd>
1243+
<dd>The object's <i>specified size</i> is a "contain" constraint.</dd>
12541244

12551245
<dt>''cover''</dt>
1256-
<dd>
1257-
<p>Determine the used 'height' and 'width' of the element as usual,
1258-
except: If both 'height' and 'width' are ''auto'', and the used value of
1259-
at least one of 'min-width' and 'min-height' is not ''none'', then compute
1260-
the element's used width and used height as though the intrinsic
1261-
dimensions of the contents were infinitely small numbers whose ratio
1262-
is the actual intrinsic ratio of the contents. This will proportionally
1263-
scale the used width and height down to the given minimum constraints.</p>
1264-
1265-
<p>The object's <i>specified size</i> is a "cover" constraint.</p>
1266-
</dd>
1246+
<dd>The object's <i>specified size</i> is a "cover" constraint.</dd>
12671247

12681248
<dt>''none''</dt>
12691249
<dd>The object has no <i>specified size</i>.</dd>

0 commit comments

Comments
 (0)