Skip to content

Commit 4edd10c

Browse files
committed
Merged Elika and my work
2 parents 6838e12 + dfccfdc commit 4edd10c

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

css3-images/Overview.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,12 +1835,13 @@ <h3 id=sizing-terms><span class=secno>5.1. </span> Object-Sizing
18351835
<dt><dfn id=concrete-object-size>concrete object size</dfn>
18361836

18371837
<dd>The <a href="#concrete-object-size"><i>concrete object size</i></a> is
1838-
the result of transforming the <a
1838+
the result of transforming an object's <a
18391839
href="#intrinsic-dimensions"><i>intrinsic dimensions</i></a> into a
1840-
concrete size, based on the <a href="#specified-size"><i>specified
1841-
size</i></a> and the <a href="#default-object-size"><i>default object
1842-
size</i></a>. A <a href="#concrete-object-size"><i>concrete object
1843-
size</i></a> always has a definite height and width.
1840+
concrete size using its <a href="#specified-size"><i>specified
1841+
size</i></a> and <a href="#default-object-size"><i>default object
1842+
size</i></a>. (See sections below.) A <a
1843+
href="#concrete-object-size"><i>concrete object size</i></a> always has a
1844+
definite height and width.
18441845

18451846
<dt><dfn id=default-object-size>default object size</dfn>
18461847

@@ -1853,7 +1854,7 @@ <h3 id=sizing-terms><span class=secno>5.1. </span> Object-Sizing
18531854
dimensions. It varies based on the context in which that the image is
18541855
being laid out.</p>
18551856

1856-
<p>The following informative list defines the <a
1857+
<p>The following informative list summarizes the <a
18571858
href="#default-object-size"><i>default object size</i></a> of properties
18581859
and contexts that appear in CSS 2.1, plus &lsquo;<code
18591860
class=property>border-image</code>&rsquo; from CSS 3 Backgrounds &amp;

css3-images/Overview.src.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,9 +1083,10 @@ <h3 id="sizing-terms">
10831083
thereof.</dd>
10841084

10851085
<dt><dfn>concrete object size</dfn></dt>
1086-
<dd>The <i>concrete object size</i> is the result of transforming the <i>intrinsic dimensions</i>
1087-
into a concrete size, based on the <i>specified size</i> and the
1088-
<i>default object size</i>. A <i>concrete object size</i> always has a definite height
1086+
<dd>The <i>concrete object size</i> is the result of transforming an
1087+
object's <i>intrinsic dimensions</i> into a concrete size using its
1088+
<i>specified size</i> and <i>default object size</i>. (See sections
1089+
below.) A <i>concrete object size</i> always has a definite height
10891090
and width.</dd>
10901091

10911092
<dt><dfn>default object size</dfn></dt>
@@ -1095,7 +1096,7 @@ <h3 id="sizing-terms">
10951096
<i>intrinsic dimensions</i> and <i>specified size</i> are missing dimensions.
10961097
It varies based on the context in which that the image is being laid out.</p>
10971098

1098-
<p>The following informative list defines the <i>default object size</i> of
1099+
<p>The following informative list summarizes the <i>default object size</i> of
10991100
properties and contexts that appear in CSS 2.1, plus 'border-image' from
11001101
CSS 3 Backgrounds &amp; Borders.
11011102
Newer modules that accept an ''&lt;image>'' component value in a new

0 commit comments

Comments
 (0)