compass 0.13.alpha.4 → 0.13.alpha.5

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

@@ -1,17 +1,15 @@
 // Box Sizing
 
-@import "shared";
-
-// @private css3-feature-support variables must always include a list of five boolean values
-// representing in order: -moz, -webkit, -ms, -o, -khtml
-$box-sizing-support:  -moz, -webkit, not -ms, not -o, not -khtml;
+@import "compass/support";
 
+// The prefixed support threshold for box-sizing.
+// Defaults to the $graceful-usage-threshold.
+$box-sizing-support-threshold: $critical-usage-threshold !default;
 
 // Change the box model for Mozilla, Webkit, IE8 and the future
 //
-// @param $box-model
-//   [ content-box | border-box | padding-box ]
+//     $box-model: [ content-box | border-box | padding-box ]
 @mixin box-sizing($box-model) {
   $box-model: unquote($box-model);
-  @include experimental(box-sizing, $box-model, $box-sizing-support...);
+  @include prefixed-properties(css3-boxsizing, $box-sizing-support-threshold, (box-sizing: $box-model));
 }

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

@@ -1,11 +1,10 @@
 // Flexible Box
+@import "deprecated-support";
 
-@import "shared";
+@warn "The compass/css3/box module is DEPRECATED and will be removed in the next release. Please use compass/css3/flexbox instead.";
 
 // @private css3-feature-support variables must always include a list of five boolean values
-// representing in order: -moz, -webkit, -ms, -o, -khtml
-$flexbox-support: -moz, -webkit, -ms, not -o, not -khtml;
-
+$legacy-box-support: -moz, -webkit, not -o, -ms, not -khtml;
 
 // Default box orientation, assuming that the user wants something less block-like
 $default-box-orient         : horizontal      !default;
@@ -35,52 +34,52 @@ $default-box-pack           : start           !default;
 // Apply 'display:box;' to an element.
 // - must be used for any of the other flexbox mixins to work properly
 @mixin display-box {
-  @include experimental-value(display, box, $flexbox-support...);
+  @include experimental-value(display, box, $legacy-box-support...);
 }
 
 // Box orientation [ horizontal | vertical | inline-axis | block-axis | inherit ]
 @mixin box-orient($orientation: $default-box-orient) {
   $orientation : unquote($orientation);
-  @include experimental(box-orient, $orientation, $flexbox-support...);
+  @include experimental(box-orient, $orientation, $legacy-box-support...);
 }
 
 // Box align [ start | end | center | baseline | stretch ]
 @mixin box-align($alignment: $default-box-align) {
   $alignment : unquote($alignment);
-  @include experimental(box-align, $alignment, $flexbox-support...);
+  @include experimental(box-align, $alignment, $legacy-box-support...);
 }
 
 // Takes an int argument for box flex. Apply this to the children inside the box.
 //
 // For example: "div.display-box > div.child-box" would get the box flex mixin.
 @mixin box-flex($flex: $default-box-flex) {
-  @include experimental(box-flex, $flex, $flexbox-support...);
+  @include experimental(box-flex, $flex, $legacy-box-support...);
 }
 
 // Takes an int argument for flexible grouping
 @mixin box-flex-group($group: $default-box-flex-group) {
-  @include experimental(box-flex-group, $group, $flexbox-support...);
+  @include experimental(box-flex-group, $group, $legacy-box-support...);
 }
 
 // Takes an int argument for ordinal grouping and rearranging the order
 @mixin box-ordinal-group($group: $default-box-ordinal-group) {
-  @include experimental(box-ordinal-group, $group, $flexbox-support...);
+  @include experimental(box-ordinal-group, $group, $legacy-box-support...);
 }
 
 // Box direction [ normal | reverse | inherit ]
 @mixin box-direction($direction: $default-box-direction) {
   $direction: unquote($direction);
-  @include experimental(box-direction, $direction, $flexbox-support...);
+  @include experimental(box-direction, $direction, $legacy-box-support...);
 }
 
 // Box lines [ single | multiple ]
 @mixin box-lines($lines: $default-box-lines) {
   $lines: unquote($lines);
-  @include experimental(box-lines, $lines, $flexbox-support...);
+  @include experimental(box-lines, $lines, $legacy-box-support...);
 }
 
 // Box pack [ start | end | center | justify ]
 @mixin box-pack($pack: $default-box-pack) {
   $pack: unquote($pack);
-  @include experimental(box-pack, $pack, $flexbox-support...);
+  @include experimental(box-pack, $pack, $legacy-box-support...);
 }

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

@@ -1,10 +1,9 @@
 // Columns
+@import "compass/support";
 
-@import "shared";
-
-// @private css3-feature-support variables must always include a list of five boolean values
-// representing in order: -moz, -webkit, -ms, -o, -khtml
-$multicolumn-support: -moz, -webkit, not -ms, not -o, not -khtml;
+// The prefixed support threshold for columns.
+// Defaults to the $critical-usage-threshold.
+$multicolumn-support-threshold: $critical-usage-threshold !default;
 
 
 // Specify the shorthand `columns` property.
@@ -13,48 +12,62 @@ $multicolumn-support: -moz, -webkit, not -ms, not -o, not -khtml;
 //
 //     @include columns(20em 2);
 @mixin columns($width-and-count) {
-  @include experimental(columns, $width-and-count, $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    columns: $width-and-count
+  ));
 }
 
 // Specify the number of columns
 @mixin column-count($count) {
-  @include experimental(column-count, $count, $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-count: $count
+  ));
 }
 
 // Specify the gap between columns e.g. `20px`
 @mixin column-gap($width) {
-  @include experimental(column-gap, $width, $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-gap: $width
+  ));
 }
 
 // Specify the width of columns e.g. `100px`
 @mixin column-width($width) {
-  @include experimental(column-width, $width, $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-width: $width
+  ));
 }
 
 // Specify how many columns an element should span across.
 //
 // * legal values are 1, all
 @mixin column-span($columns) {
-	@include experimental(column-span, $columns,
-		-moz, -webkit, -o, -ms, not -khtml, official
-	);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-span: $columns
+  ));
 }
 
 // Specify the width of the rule between columns e.g. `1px`
 @mixin column-rule-width($width) {
-  @include experimental(rule-width, $width, $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    rule-width: $width
+  ));
 }
 
 // Specify the style of the rule between columns e.g. `dotted`.
 // This works like border-style.
 @mixin column-rule-style($style) {
-  @include experimental(rule-style, unquote($style), $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    rule-style: $style
+  ));
 }
 
 // Specify the color of the rule between columns e.g. `blue`.
 // This works like border-color.
 @mixin column-rule-color($color) {
-  @include experimental(rule-color, $color, $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    rule-color: $color
+  ));
 }
 
 // Mixin encompassing all column rule properties
@@ -65,9 +78,10 @@ $multicolumn-support: -moz, -webkit, not -ms, not -o, not -khtml;
 // Or the values can be space separated:
 //
 //     @include column-rule(1px solid #c00)
-@mixin column-rule($width, $style: false, $color: false) {
-  $full : -compass-space-list(compact($width, $style, $color));
-  @include experimental(column-rule, $full, $multicolumn-support...);
+@mixin column-rule($width, $style: null, $color: null) {
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-rule: $width $style $color
+  ));
 }
 
 // All-purpose mixin for setting column breaks.
@@ -97,13 +111,15 @@ $multicolumn-support: -moz, -webkit, not -ms, not -o, not -khtml;
 //    break-inside: auto;}
 
 @mixin column-break($type: before, $value: auto){
-  // Webkit uses non-standard syntax
-  @if $experimental-support-for-webkit {
-    -webkit-column-break-#{$type}: $value;
+  @include with-each-prefix(multicolumn, $multicolumn-support-threshold) {
+    @if $current-prefix == -webkit {
+      // Webkit uses non-standard syntax
+      -webkit-column-break-#{$type}: $value;
+    } @else {
+      // Official syntax
+      break-#{$type}: $value;
+    }
   }
-
-  // Official syntax
-  break-#{$type}: $value;
 }
 
 // Mixin for setting break-before
@@ -176,7 +192,9 @@ $multicolumn-support: -moz, -webkit, not -ms, not -o, not -khtml;
 //  Example:
 //    h2.span {@include column-span();}
 @mixin column-span($span: all){
-  @include experimental(column-span, unquote($span), $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-span: $span
+  ));
 }
 
 // Mixin for setting column-fill
@@ -186,5 +204,7 @@ $multicolumn-support: -moz, -webkit, not -ms, not -o, not -khtml;
 //  Example:
 //    h2.fill {@include column-fill();}
 @mixin column-fill($fill: balance){
-  @include experimental(column-fill, unquote($fill), $multicolumn-support...);
+  @include prefixed-properties(multicolumn, $multicolumn-support-threshold,(
+    column-fill: $fill
+  ));
 }

data/frameworks/compass/stylesheets/compass/css3/_deprecated-support.scss

@@ -0,0 +1,272 @@
+@import "compass/support";
+
+// XXX Remove these
+$experimental-support-for-mozilla: true !default;
+$experimental-support-for-webkit: true !default;
+$experimental-support-for-opera: true !default;
+$experimental-support-for-microsoft: true !default;
+$experimental-support-for-khtml: false !default;
+$experimental-support-for-svg: false !default;
+$legacy-support-for-ie6: true !default;
+$legacy-support-for-ie7: true !default;
+$legacy-support-for-ie8: true !default;
+$legacy-support-for-mozilla: true !default;
+$legacy-support-for-webkit: true !default;
+
+// This mixin provides basic support for CSS3 properties and
+// their corresponding experimental CSS2 properties when
+// the implementations are identical except for the property
+// prefix.
+@mixin experimental($property, $value,
+  $moz      : $experimental-support-for-mozilla,
+  $webkit   : $experimental-support-for-webkit,
+  $o        : $experimental-support-for-opera,
+  $ms       : $experimental-support-for-microsoft,
+  $khtml    : $experimental-support-for-khtml,
+  $official : true
+) {
+  @if $webkit  and $experimental-support-for-webkit    { -webkit-#{$property} : $value; }
+  @if $khtml   and $experimental-support-for-khtml     {  -khtml-#{$property} : $value; }
+  @if $moz     and $experimental-support-for-mozilla   {    -moz-#{$property} : $value; }
+  @if $ms      and $experimental-support-for-microsoft {     -ms-#{$property} : $value; }
+  @if $o       and $experimental-support-for-opera     {      -o-#{$property} : $value; }
+  @if $official                                        {         #{$property} : $value; }
+}
+
+// This mixin is a shortcut for applying only a single experimental value
+@mixin experimental-only-for($property, $value,
+  $moz      : false,
+  $webkit   : false,
+  $o        : false,
+  $ms       : false,
+  $khtml    : false,
+  $official : false
+) {
+  @include experimental($property, $value, $moz, $webkit, $o, $ms, $khtml, $official);
+}
+
+// Same as experimental(), but for cases when the property is the same and the value is vendorized
+@mixin experimental-value($property, $value,
+  $moz      : $experimental-support-for-mozilla,
+  $webkit   : $experimental-support-for-webkit,
+  $o        : $experimental-support-for-opera,
+  $ms       : $experimental-support-for-microsoft,
+  $khtml    : $experimental-support-for-khtml,
+  $official : true
+) {
+  @if $webkit  and $experimental-support-for-webkit    { #{$property} : -webkit-#{$value}; }
+  @if $khtml   and $experimental-support-for-khtml     { #{$property} :  -khtml-#{$value}; }
+  @if $moz     and $experimental-support-for-mozilla   { #{$property} :    -moz-#{$value}; }
+  @if $ms      and $experimental-support-for-microsoft { #{$property} :     -ms-#{$value}; }
+  @if $o       and $experimental-support-for-opera     { #{$property} :      -o-#{$value}; }
+  @if $official                                        { #{$property} :         #{$value}; }
+}
+
+// @private
+// Check a given support list for support of a particular browser
+@function supported(
+  $prefix,
+  $support-list
+) {
+  $keys: moz, webkit, o, ms, khtml, official;
+  $index: index($keys, $prefix);
+
+  @if $index {
+    @if $index == 6 and length($support-list) == 5 {
+      @return official;
+    } @else {
+      @return nth($support-list, $index);
+    }
+  } @else {
+    @warn 'Please pass a valid browser for $prefix: moz, webkit, o, ms, khtml, or official.';
+  }
+}
+
+// A debug tool for checking browser support
+@mixin debug-support-matrix($experimental: true, $ie: true) {
+  @debug  #{'$moz-'}$experimental-support-for-mozilla
+          #{'$webkit-'}$experimental-support-for-webkit
+          #{'$opera-'}$experimental-support-for-opera
+          #{'$microsoft-'}$experimental-support-for-microsoft
+          #{'$khtml-'}$experimental-support-for-khtml;
+  @debug  #{'$ie6-'}$legacy-support-for-ie6
+          #{'$ie7-'}$legacy-support-for-ie7
+          #{'$ie8-'}$legacy-support-for-ie8;
+}
+
+// Capture the current exerimental support settings
+@function capture-experimental-matrix() {
+  @return $experimental-support-for-mozilla
+          $experimental-support-for-webkit
+          $experimental-support-for-opera
+          $experimental-support-for-microsoft
+          $experimental-support-for-khtml;
+}
+
+// Capture the current legacy-ie support settings
+@function capture-legacy-ie-matrix() {
+  @return $legacy-support-for-ie6
+          $legacy-support-for-ie7
+          $legacy-support-for-ie8;
+}
+
+// Capture and store support
+$experimental-matrix: capture-experimental-matrix();
+$legacy-ie-matrix: capture-legacy-ie-matrix();
+
+@mixin capture-experimental-matrix {
+  $experimental-matrix: capture-experimental-matrix();
+}
+
+@mixin capture-legacy-ie-matrix {
+  $legacy-ie-matrix: capture-legacy-ie-matrix();
+}
+
+@mixin capture-support-matrix {
+  @include capture-experimental-matrix;
+  @include capture-legacy-ie-matrix;
+}
+
+// Change the experimental-support settings in specific contexts.
+@mixin set-experimental-support(
+  $moz    : false,
+  $webkit : false,
+  $o      : false,
+  $ms     : false,
+  $khtml  : false
+) {
+  $experimental-support-for-mozilla   : $moz;
+  $experimental-support-for-webkit    : $webkit;
+  $experimental-support-for-opera     : $o;
+  $experimental-support-for-microsoft : $ms;
+  $experimental-support-for-khtml     : $khtml;
+}
+
+@mixin capture-and-set-experimental(
+  $moz    : false,
+  $webkit : false,
+  $o      : false,
+  $ms     : false,
+  $khtml  : false
+) {
+  @include capture-experimental-matrix;
+  @include set-experimental-support($moz, $webkit, $o, $ms, $khtml);
+}
+
+@mixin capture-and-adjust-experimental(
+  $moz    : $experimental-support-for-mozilla,
+  $webkit : $experimental-support-for-webkit,
+  $o      : $experimental-support-for-opera,
+  $ms     : $experimental-support-for-microsoft,
+  $khtml  : $experimental-support-for-khtml
+) {
+  @include capture-experimental-matrix;
+  @include set-experimental-support($moz, $webkit, $o, $ms, $khtml);
+}
+
+// Change the legacy-support-for-ie* settings in specific contexts.
+@mixin set-legacy-ie-support(
+  $ie6: false,
+  $ie7: false,
+  $ie8: false
+) {
+  $legacy-support-for-ie6: $ie6;
+  $legacy-support-for-ie7: $ie7;
+  $legacy-support-for-ie8: $ie8;
+}
+
+@mixin capture-and-set-legacy-ie(
+  $ie6: false,
+  $ie7: false,
+  $ie8: false
+) {
+  @include capture-legacy-ie-matrix;
+  @include set-legacy-ie-support($ie6, $ie7, $ie8);
+}
+
+@mixin capture-and-adjust-legacy-ie(
+  $ie6: $legacy-support-for-ie6,
+  $ie7: $legacy-support-for-ie7,
+  $ie8: $legacy-support-for-ie8
+) {
+  @include capture-and-set-legacy-ie($ie6, $ie7, $ie8);
+}
+
+// Capture current browser support matrix, and set a new matrix of support.
+@mixin capture-and-set-support(
+  $moz    : false,
+  $webkit : false,
+  $o      : false,
+  $ms     : false,
+  $khtml  : false,
+  $ie6    : false,
+  $ie7    : false,
+  $ie8    : false
+) {
+  // Capture the current state
+  @include capture-support-matrix;
+
+  // Change support settings
+  @include set-experimental-support($moz, $webkit, $o, $ms, $khtml);
+  @include set-legacy-ie-support($ie6, $ie7, $ie8);
+}
+
+// Capture current browser support matrix, and set a new matrix of support.
+@mixin capture-and-adjust-support(
+  $moz        : $experimental-support-for-mozilla,
+  $webkit     : $experimental-support-for-webkit,
+  $o          : $experimental-support-for-opera,
+  $ms         : $experimental-support-for-microsoft,
+  $khtml      : $experimental-support-for-khtml,
+  $ie6        : $legacy-support-for-ie6,
+  $ie7        : $legacy-support-for-ie7,
+  $ie8        : $legacy-support-for-ie8
+) {
+  @include capture-and-set-support($moz, $webkit, $o, $ms, $khtml, $ie6, $ie7, $ie8);
+}
+
+
+// This mixin allows you to change the experimental support settings for
+// child (@content) styles.
+@mixin with-only-support-for(
+  $moz    : false,
+  $webkit : false,
+  $o      : false,
+  $ms     : false,
+  $khtml  : false,
+  $ie6    : false,
+  $ie7    : false,
+  $ie8    : false
+) {
+  // Capture current state
+  $wo-experimental-matrix : capture-experimental-matrix();
+  $wo-legacy-ie-matrix    : capture-legacy-ie-matrix();
+
+  // Set new states
+  @include set-experimental-support($moz, $webkit, $o, $ms, $khtml);
+  @include set-legacy-ie-support($ie6, $ie7, $ie8);
+
+  // Apply styles
+  @content;
+
+  // Return to original support settings
+  @include set-experimental-support($wo-experimental-matrix...);
+  @include set-legacy-ie-support($wo-legacy-ie-matrix...);
+}
+
+// This mixin is a shortcut for making slight adjustments to browser support
+// for child (@content) styles
+@mixin adjust-support-for(
+    $moz        : $experimental-support-for-mozilla,
+    $webkit     : $experimental-support-for-webkit,
+    $o          : $experimental-support-for-opera,
+    $ms         : $experimental-support-for-microsoft,
+    $khtml      : $experimental-support-for-khtml,
+    $ie6        : $legacy-support-for-ie6,
+    $ie7        : $legacy-support-for-ie7,
+    $ie8        : $legacy-support-for-ie8
+) {
+  @include with-only-support-for($moz, $webkit, $o, $ms, $khtml, $ie6, $ie7, $ie8) {
+    @content;
+  }
+}