Merge

Wed, 23 May 2012 21:39:42 -0700

author
ratan@microsoft.com
date
Wed, 23 May 2012 21:39:42 -0700
changeset 5887
3f3482b19941
parent 5885
cc01d324662a
parent 5886
ae60fab8c415
child 5888
a2935285a771

Merge

     1.1 --- a/css3-exclusions/Exclusions.src.html	Wed May 23 21:32:04 2012 -0700
     1.2 +++ b/css3-exclusions/Exclusions.src.html	Wed May 23 21:39:42 2012 -0700
     1.3 @@ -416,12 +416,20 @@
     1.4                  <td><img src="images/exclusion_wrap_side_right.png" alt="Example rendering for wrap-side: end" /></td>
     1.5              </tr>
     1.6              <tr>
     1.7 +                <td><code class="html">#exclusion{ wrap-flow: minimum; }</code></td>
     1.8                  <td><code class="html">#exclusion{ wrap-flow: maximum; }</code></td>
     1.9 -                <td><code class="html">#exclusion{ wrap-flow: clear; }</code></td>
    1.10              </tr>
    1.11              <tr>
    1.12 +                <td><img src="images/exclusion_wrap_side_minimum.png" alt="Example rendering for wrap-side: minimum" /></td>
    1.13                  <td><img src="images/exclusion_wrap_side_maximum.png" alt="Example rendering for wrap-side: maximum" /></td>
    1.14 -               <td><img src="images/exclusion_wrap_side_clear.png" alt="Example rendering for wrap-side: clear" /></td>
    1.15 +            </tr>
    1.16 +            <tr>
    1.17 +                <td><code class="html">#exclusion{ wrap-flow: clear; }</code></td>
    1.18 +                <td></td>
    1.19 +            </tr>
    1.20 +            <tr>
    1.21 +                <td><img src="images/exclusion_wrap_side_clear.png" alt="Example rendering for wrap-side: clear" /></td>
    1.22 +                <td></td>
    1.23              </tr>
    1.24          </table>
    1.25      </div>
     2.1 --- a/css3-exclusions/Overview.html	Wed May 23 21:32:04 2012 -0700
     2.2 +++ b/css3-exclusions/Overview.html	Wed May 23 21:39:42 2012 -0700
     2.3 @@ -777,16 +777,27 @@
     2.4         src="images/exclusion_wrap_side_right.png">
     2.5  
     2.6       <tr>
     2.7 +      <td><code class=html>#exclusion{ wrap-flow: minimum; }</code>
     2.8 +
     2.9        <td><code class=html>#exclusion{ wrap-flow: maximum; }</code>
    2.10  
    2.11 -      <td><code class=html>#exclusion{ wrap-flow: clear; }</code>
    2.12 -
    2.13       <tr>
    2.14 +      <td><img alt="Example rendering for wrap-side: minimum"
    2.15 +       src="images/exclusion_wrap_side_minimum.png">
    2.16 +
    2.17        <td><img alt="Example rendering for wrap-side: maximum"
    2.18         src="images/exclusion_wrap_side_maximum.png">
    2.19  
    2.20 +     <tr>
    2.21 +      <td><code class=html>#exclusion{ wrap-flow: clear; }</code>
    2.22 +
    2.23 +      <td>
    2.24 +
    2.25 +     <tr>
    2.26        <td><img alt="Example rendering for wrap-side: clear"
    2.27         src="images/exclusion_wrap_side_clear.png">
    2.28 +
    2.29 +      <td>
    2.30     </table>
    2.31    </div>
    2.32    <!-- End section "wrap-flow Property" -->

mercurial