1.1 --- a/css3-cascade/Overview.src.html Fri Dec 14 15:55:21 2012 -0800 1.2 +++ b/css3-cascade/Overview.src.html Mon Dec 17 02:09:38 2012 -0800 1.3 @@ -108,8 +108,9 @@ 1.4 1.5 <p> 1.6 So that user agents can avoid retrieving resources for unsupported media types, 1.7 - authors may specify media-dependent ''@import'' rules. 1.8 - These <dfn title="conditional import|media-dependent import">conditional imports</dfn> specify comma-separated “media queries” after the URI. 1.9 + authors may specify media-dependent ''@import'' rules. 1.10 + Such media-dependent imports include a comma-separated list of “media queries” after the URI. 1.11 + The UA must import the style sheet only if the media query evaluates to true. 1.12 1.13 <div class=example> 1.14 <p> 1.15 @@ -159,7 +160,8 @@ 1.16 <div class='example'> 1.17 <p> 1.18 For example, the CSS 2.1 'font' property 1.19 - is a shorthand property for setting 'font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', and 'font-family' all at once. The multiple style rules of this example: 1.20 + is a shorthand property for setting 'font-style', 'font-variant', 'font-weight', 'font-size', 'line-height', and 'font-family' all at once. 1.21 + The multiple declarations of this example: 1.22 1.23 <pre> 1.24 h1 { 1.25 @@ -283,13 +285,12 @@ 1.26 </ul> 1.27 1.28 <p> 1.29 - The remaining declarations form, 1.30 + The declarations that apply form, 1.31 for each property on each element, 1.32 - an unordered list of values. 1.33 + a list of potential values. 1.34 The next section, 1.35 - the cascade process, 1.36 - orders these lists. 1.37 - 1.38 + the cascade, 1.39 + prioritizes these lists. 1.40 1.41 <h3 id='cascade'> 1.42 Cascading Declarations</h3> 1.43 @@ -301,7 +302,7 @@ 1.44 1.45 <p> 1.46 User agents must sort declarations according to the following criteria, 1.47 - in descending order of importance: 1.48 + in descending order of priority: 1.49 1.50 <dl> 1.51 <dt id='cascade-origin'>Origin 1.52 @@ -571,11 +572,13 @@ 1.53 <p> 1.54 Once a user agent has parsed a document and constructed a document tree, 1.55 it must assign, 1.56 - for every element in the tree, 1.57 + to every element in the tree, 1.58 + and correspondingly to every box in the formatting structure, 1.59 a value to every property that applies to the target media type. 1.60 1.61 <p> 1.62 - The final value of a CSS3 property for a given element is the result of a four-step calculation: 1.63 + The final value of a CSS3 property for a given element or box 1.64 + is the result of a four-step calculation: 1.65 1.66 <ul> 1.67 <li> 1.68 @@ -804,7 +807,7 @@ 1.69 <ul> 1.70 <li>Dropped alternate style sheets feature. 1.71 <li>Resync'd spec against <a href="http://www.w3.org/TR/CSS21/">CSS2.1</a>. 1.72 - <li>Imported <a href="#value-stages">Stages of Value Computation</a> section 1.73 + <li>Imported and updated <a href="#value-stages">Stages of Value Computation</a> section 1.74 from old drafts of <a href="http://www.w3.org/TR/css3-values/">CSS Values and Units</a>. 1.75 <li>Introduced <a href="#cascade-scope">scoping</a> per <a href="http://www.w3.org/mid/4F570227.8060707@mit.edu">Boris Zbarsky's suggestion</a>. 1.76 <li>Introduced ''default'' keyword.