compass 0.10.0.rc4 → 0.10.0.rc5

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: rc4
+:build: rc5

data/examples/css3/extensions/fancy-fonts/templates/project/fancy-fonts.sass

@@ -1,7 +1,10 @@
-@import compass/css3.sass
+@import compass/css3
 
-+font-face("Vtks Revolt", font-files("Vtks Revolt.ttf", 'truetype'))
-+font-face("Angelina", font-files("angelina.ttf", 'truetype'))
++font-face("Blooming Grove", font-files("bgrove.ttf", truetype, "bgrove.otf", opentype))
++font-face("Prociono", font-files("Prociono.otf", opentype))
 h1
-  font-family: "Vtks Revolt"
+  font-family: "Blooming Grove"
   font-size: 3em
+h2
+  font-family: "Prociono"
+  font-size: 2em

data/examples/css3/extensions/fancy-fonts/templates/project/manifest.rb

@@ -1,5 +1,6 @@
-# From http://www.dafont.com/vtks-revolt.font
-font 'Vtks Revolt.ttf'
-# From http://www.dafont.com/angelina.font
-font 'angelina.ttf'
+# From http://openfontlibrary.org/media/files/jonadab/414
+font 'bgrove.otf'
+font 'bgrove.ttf'
+# http://openfontlibrary.org/media/files/chemoelectric/206
+font 'Prociono.otf'
 stylesheet 'fancy-fonts.sass'

data/examples/css3/gradients.html.haml

@@ -57,4 +57,12 @@
           %th
           %td.linear-code
           %td.radial-code
+        %tr.with-bg
+          %th With Background Image
+          %td.linear <br><br><br>
+          %td.radial <br><br><br>
+        %tr.with-bg
+          %th
+          %td.linear-code
+          %td.radial-code
 

data/examples/css3/src/fancy-fonts.scss

@@ -1,7 +1,13 @@
 @import "compass/css3";
 
-@include font-face(Angelina, font_files(unquote("angelina.ttf"), truetype));
+@include font-face("Blooming Grove", font-files("bgrove.ttf", truetype, "bgrove.otf", opentype));
+
+@include font-face("Prociono", font-files("Prociono.otf", opentype));
 
 h1 {
-  font-family: "Angelina";
-  font-size: 5em; }
+  font-family: "Blooming Grove";
+  font-size: 3em; }
+
+h2 {
+  font-family: "Prociono";
+  font-size: 2em; }

data/examples/css3/src/gradients.scss

@@ -11,67 +11,76 @@ thead th {
   @include text-shadow(white); }
 
 th.linear {
-  @include linear-gradient(color_stops(white, red 50%, yellow 75%, lime)); }
+  @include linear-gradient(color-stops(white, red 50%, yellow 75%, lime)); }
 
 th.radial {
-  @include radial-gradient(color_stops(white, red 20px, yellow 30px, lime 40px)); }
+  @include radial-gradient(color-stops(white, red 20px, yellow 30px, lime 40px)); }
 
 tr.default {
   td.linear {
-    @include linear-gradient(color_stops(#cc0000, #0000cc)); }
+    @include linear-gradient(color-stops(#cc0000, #0000cc)); }
   td.radial {
-    @include radial-gradient(color_stops(#cc0000, #0000cc)); }
+    @include radial-gradient(color-stops(#cc0000, #0000cc)); }
   td.linear-code:before {
-    content: "+linear-gradient(color_stops(#c00, #00c))"; }
+    content: "+linear-gradient(color-stops(#c00, #00c))"; }
   td.radial-code:before {
-    content: "+radial-gradient(color_stops(#c00, #00c))"; } }
+    content: "+radial-gradient(color-stops(#c00, #00c))"; } }
 
 tr.top-left {
   td.linear {
-    @include linear-gradient(color_stops(#cc0000, #0000cc), unquote("top left")); }
+    @include linear-gradient(color-stops(#cc0000, #0000cc), unquote("top left")); }
   td.radial {
-    @include radial-gradient(color_stops(#cc0000, #0000cc), unquote("top left")); }
+    @include radial-gradient(color-stops(#cc0000, #0000cc), unquote("top left")); }
   td.linear-code:before {
-    content: '+linear-gradient(color_stops(#c00, #00c), "top left")'; }
+    content: '+linear-gradient(color-stops(#c00, #00c), "top left")'; }
   td.radial-code:before {
-    content: '+radial-gradient(color_stops(#c00, #00c), "top left")'; } }
+    content: '+radial-gradient(color-stops(#c00, #00c), "top left")'; } }
 
 tr.bottom-right {
   td.linear {
-    @include linear-gradient(color_stops(#cc0000, #0000cc), unquote("bottom right")); }
+    @include linear-gradient(color-stops(#cc0000, #0000cc), unquote("bottom right")); }
   td.radial {
-    @include radial-gradient(color_stops(#cc0000, #0000cc), unquote("bottom right")); }
+    @include radial-gradient(color-stops(#cc0000, #0000cc), unquote("bottom right")); }
   td.linear-code:before {
-    content: '+linear-gradient(color_stops(#c00, #00c), "bottom right")'; }
+    content: '+linear-gradient(color-stops(#c00, #00c), "bottom right")'; }
   td.radial-code:before {
-    content: '+radial-gradient(color_stops(#c00, #00c), "bottom right")'; } }
+    content: '+radial-gradient(color-stops(#c00, #00c), "bottom right")'; } }
 
 tr.three-color {
   td.linear {
-    @include linear-gradient(color_stops(#cc0000, white, #0000cc)); }
+    @include linear-gradient(color-stops(#cc0000, white, #0000cc)); }
   td.radial {
-    @include radial-gradient(color_stops(#cc0000, white, #0000cc 50px)); }
+    @include radial-gradient(color-stops(#cc0000, white, #0000cc 50px)); }
   td.linear-code:before {
-    content: "+linear-gradient(color_stops(#c00, #fff, #00c))"; }
+    content: "+linear-gradient(color-stops(#c00, #fff, #00c))"; }
   td.radial-code:before {
-    content: "+radial-gradient(color_stops(#c00, #fff, #00c 50px))"; } }
+    content: "+radial-gradient(color-stops(#c00, #fff, #00c 50px))"; } }
 
 tr.four-color {
   td.linear {
-    @include linear-gradient(color_stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc)); }
+    @include linear-gradient(color-stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc)); }
   td.radial {
-    @include radial-gradient(color_stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc 50px)); }
+    @include radial-gradient(color-stops(#cc0000, #00cc00 25%, #00cccc 75%, #0000cc 50px)); }
   td.linear-code:before {
-    content: "+linear-gradient(color_stops(#c00, #0c0 25%, #0cc 75%, #00c))"; }
+    content: "+linear-gradient(color-stops(#c00, #0c0 25%, #0cc 75%, #00c))"; }
   td.radial-code:before {
-    content: "+radial-gradient(color_stops(#c00, #0c0 25%, #0cc 75%, #00c 50px))"; } }
+    content: "+radial-gradient(color-stops(#c00, #0c0 25%, #0cc 75%, #00c 50px))"; } }
 
 tr.filled-in {
   td.linear {
-    @include linear-gradient(color_stops(#cc0000 33%, #0000cc 66%)); }
+    @include linear-gradient(color-stops(#cc0000 33%, #0000cc 66%)); }
   td.radial {
-    @include radial-gradient(color_stops(#cc0000 25px, #0000cc 75px)); }
+    @include radial-gradient(color-stops(#cc0000 25px, #0000cc 75px)); }
   td.linear-code:before {
-    content: "+linear-gradient(color_stops(#c00 33%, #00c 66%))"; }
+    content: "+linear-gradient(color-stops(#c00 33%, #00c 66%))"; }
   td.radial-code:before {
-    content: "+radial-gradient(color_stops(#c00 25px, #00c 75px))"; } }
+    content: "+radial-gradient(color-stops(#c00 25px, #00c 75px))"; } }
+tr.with-bg {
+  td.linear {
+    @include linear-gradient(color-stops(#cc0000 33%, #0000cc 66%), top, image-url("button_bg.png")); }
+  td.radial {
+    @include radial-gradient(color-stops(#cc0000 25px, #0000cc 75px), center center, image-url("button_bg.png")); }
+  td.linear-code:before {
+    content: "+linear-gradient(color-stops(#cc0000 33%, #0000cc 66%), top, image-url(\"button_bg.png\"))"; }
+  td.radial-code:before {
+    content: "+radial-gradient(color-stops(#cc0000 25px, #0000cc 75px), center center, image-url(\"button_bg.png\"))"; } }

data/examples/css3/src/main.scss

@@ -1,5 +1,6 @@
 @import "blueprint/reset";
 @import "base";
+@import "fancy-fonts";
 
 $border_color: #aaaaaa;
 
@@ -28,7 +29,6 @@ h1 {
   @include box-shadow(darken($border_color, 40), 5px, 5px, 2px);
   margin-bottom: 1em;
   h2 {
-    font-family: Angelina;
     margin: 0.5em 0 1em;
     text-align: center; } }
 
@@ -50,7 +50,7 @@ h1 {
 
 #background-clip {
   pre {
-    background: transparent #{image_url("fresh-peas.jpg")} no-repeat;
+    background: transparent #{image_url("example.png")} no-repeat;
     border: 1em solid rgba(255, 0, 0, 0.25); }
   .padding-box {
     @include background-clip(padding-box);
@@ -61,7 +61,7 @@ h1 {
 
 #background-size {
   pre {
-    background: transparent #{image_url("fresh-peas.jpg")} no-repeat;
+    background: transparent #{image_url("example.png")} no-repeat;
     border: 1em solid #{mix(red, white, 0.5)};
     border: 1em solid rgba(255, 0, 0, 0.25); }
   .top-left {

data/features/command_line.feature

@@ -240,11 +240,12 @@ Feature: Command Line
     When I run: compass stats
     Then I am told statistics for each file:
       | Filename             | Rules | Properties | Mixins Defs | Mixins Used | CSS Rules | CSS Properties |
+      | sass/box.sass        |    15 |          0 |           0 |          19 |        15 |             59 |
       | sass/gradients.sass  |    19 |          0 |           0 |          19 |        19 |             19 |
       | sass/image_size.sass |     4 |          8 |           0 |           0 |         4 |              8 |
       | sass/layout.sass     |     0 |          0 |           0 |           1 |         5 |             10 |
       | sass/print.sass      |     0 |          0 |           0 |           2 |        61 |             61 |
-      | sass/reset.sass      |     4 |          1 |           0 |           2 |       191 |            665 |
+      | sass/reset.sass      |     4 |          1 |           0 |           2 |       190 |            664 |
       | sass/utilities.sass  |     2 |          0 |           0 |           2 |         5 |             11 |
-      | Total.*              |    29 |          9 |           0 |          26 |       285 |            774 |
-
+      | Total.*              |    44 |          9 |           0 |          45 |       299 |            832 |
+ 

data/frameworks/compass/stylesheets/compass/_reset.scss

@@ -1,3 +1,3 @@
-@import "utilities/general/reset";
+@import "reset/utilities";
 
 @include global-reset;

data/frameworks/compass/stylesheets/compass/css3/_background-clip.scss

@@ -24,19 +24,19 @@ $default-background-clip: padding-box !default;
   @if $clip == border-box { $deprecated: border; }
   // Support for webkit and mozilla's use of the deprecated short form
   @include experimental(background-clip, $deprecated,
-    $experimental-support-for-mozilla,
-    $experimental-support-for-webkit,
-    false, // opera
-    false, // microsoft
-    false, // khtml
-    false  // official
+    -moz,
+    -webkit,
+    not -o,
+    not -ms,
+    not -khtml,
+    not official
   );
   @include experimental(background-clip, $clip,
-    false, // mozilla
-    false, // webkit
-    $experimental-support-for-opera,
-    $experimental-support-for-microsoft,
-    $experimental-support-for-khtml,
-    true // official
+    not -moz,
+    not -webkit,
+    -o,
+    -ms,
+    -khtml,
+    official
   );
 }

data/frameworks/compass/stylesheets/compass/css3/_background-origin.scss

@@ -23,19 +23,19 @@ $default-background-origin: content-box !default;
 
   // Support for webkit and mozilla's use of the deprecated short form
   @include experimental(background-origin, $deprecated,
-    $experimental-support-for-mozilla,
-    $experimental-support-for-webkit,
-    false, // opera
-    false, // microsoft
-    false, // khtml
-    false  // official
+    -moz,
+    -webkit,
+    not -o,
+    not -ms,
+    not -khtml,
+    not official
   );
   @include experimental(background-origin, $origin,
-    false, // mozilla
-    false, // webkit
-    $experimental-support-for-opera,
-    $experimental-support-for-microsoft,
-    $experimental-support-for-khtml,
-    true // official
+    not -moz,
+    not -webkit,
+    -o,
+    -ms,
+    -khtml,
+    official
   );
 }

data/frameworks/compass/stylesheets/compass/css3/_background-size.scss

@@ -9,5 +9,5 @@ $default-background-size: 100% auto !default;
 // * percentages are relative to the background-origin (default = padding-box)
 // * mixin defaults to: `$default-background-size`
 @mixin background-size($size: $default-background-size) {
-  @include experimental(background-size, $size);
+  @include experimental(background-size, $size, -moz, -webkit, -o, not -ms, not -khtml);
 }

data/frameworks/compass/stylesheets/compass/css3/_border-radius.scss

@@ -19,20 +19,20 @@ $default-border-radius: 5px !default;
   -webkit-border-#{$vert}-#{$horz}-radius: $radius;
   // Support for mozilla's syntax for specifying a corner
   @include experimental("border-radius-#{$vert}#{$horz}", $radius,
-    $experimental-support-for-mozilla,
-    false, // webkit
-    false, // opera
-    false, // microsoft
-    false, // khtml
-    false  // official
+    -moz,
+    not -webkit,
+    not -o,
+    not -ms,
+    not -khtml,
+    not official
   );
   @include experimental("border-#{$vert}-#{$horz}-radius", $radius,
-    false, // mozilla
-    $experimental-support-for-webkit,
-    $experimental-support-for-opera,
-    $experimental-support-for-microsoft,
-    $experimental-support-for-khtml,
-    true // official
+    not -moz,
+    -webkit,
+    -o,
+    -ms,
+    -khtml,
+    official
   );
   
 }

data/frameworks/compass/stylesheets/compass/css3/_box-shadow.scss

@@ -27,8 +27,12 @@ $default-box-shadow-blur: 5px !default;
   $blur: $default-box-shadow-blur
 ) {
   @if $color == none {
-    @include experimental(box-shadow, none);
+    @include experimental(box-shadow, none,
+      -moz, -webkit, -o, not -ms, not -khtml, official
+    );
   } @else {
-    @include experimental(box-shadow, $color $hoff $voff $blur);
+    @include experimental(box-shadow, $color $hoff $voff $blur,
+      -moz, -webkit, -o, not -ms, not -khtml, official
+    );
   }
 }

data/frameworks/compass/stylesheets/compass/css3/_box-sizing.scss

@@ -6,5 +6,7 @@
 //   [ content-box | border-box ]
 
 @mixin box-sizing($bs) {
-  @include experimental(box-sizing, $bs);
+  @include experimental(box-sizing, $bs,
+    -moz, -webkit, not -o, -ms, not -khtml, official
+  );
 }

data/frameworks/compass/stylesheets/compass/css3/_box.scss

@@ -2,7 +2,9 @@
 
 // display:box; must be used for any of the other flexbox mixins to work properly
 @mixin display-box {
-  @include experimental-value(display,box);
+  @include experimental-value(display, box,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // Default box orientation, assuming that the user wants something less block-like
@@ -12,7 +14,9 @@ $default-box-orient: horizontal !default;
 @mixin box-orient(
   $orientation: $default-box-orient
 ) {
-  @include experimental(box-orient, $orientation);
+  @include experimental(box-orient, $orientation,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // Default box-align
@@ -22,7 +26,9 @@ $default-box-align: stretch !default;
 @mixin box-align(
   $alignment: $default-box-align
 ) {
-  @include experimental(box-align, $alignment);
+  @include experimental(box-align, $alignment,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // Default box flex
@@ -34,7 +40,9 @@ $default-box-flex: 0 !default;
 @mixin box-flex(
   $flex: $default-box-flex
 ) {
-  @include experimental(box-flex, $flex);
+  @include experimental(box-flex, $flex,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
   display: block;
 }
 
@@ -45,7 +53,9 @@ $default-box-flex-group: 1 !default;
 @mixin box-flex-group(
   $group: $default-box-flex-group
 ) {
-  @include experimental(box-flex-group, $group);
+  @include experimental(box-flex-group, $group,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // default for ordinal group
@@ -55,7 +65,9 @@ $default-box-ordinal-group: 1 !default;
 @mixin box-ordinal-group(
   $group: $default-ordinal-flex-group
 ) {
-  @include experimental(box-ordinal-group, $group);
+  @include experimental(box-ordinal-group, $group,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // Box direction default value
@@ -65,7 +77,9 @@ $default-box-direction: normal !default;
 @mixin box-direction(
   $direction: $default-box-direction
 ) {
-  @include experimental(box-direction, $direction);
+  @include experimental(box-direction, $direction,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // default for box lines
@@ -75,7 +89,9 @@ $default-box-lines: single !default;
 @mixin box-lines(
   $lines: $default-box-lines
 ) {
-  @include experimental(box-lines, $lines);
+  @include experimental(box-lines, $lines,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }
 
 // default for box pack
@@ -85,5 +101,7 @@ $default-box-pack: start !default;
 @mixin box-pack(
   $pack: $default-box-pack
 ) {
-  @include experimental(box-pack, $pack);
+  @include experimental(box-pack, $pack,
+    -moz, -webkit, not -o, not -ms, not -khtml, official
+  );
 }