compass 0.13.alpha.0 → 0.13.alpha.2

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

@@ -2,41 +2,43 @@
 
 @import "shared";
 
+// ----------------------------------------------------------------------------
+// @private css3-feature-support variables must always include a list of five boolean values
+// representing in order: -moz, -webkit, -o, -ms, -khtml
+//   - mozilla/webkit legacy support handled seperately below
+$background-origin-support: not -moz, not -webkit, not -o, not -ms, -khtml;
+
+// ----------------------------------------------------------------------------
+// Default
+
+// The default background-origin: [border-box | padding-box | content-box]
 $default-background-origin: content-box !default;
 
-// Position the background off the edge of the padding, border or content
-//
-// * Possible values:
-//   * `padding-box`
-//   * `border-box`
-//   * `content-box`
-// * browser defaults to `padding-box`
-// * mixin defaults to `content-box`
-
-
-@mixin background-origin($origin: $default-background-origin) {
-  $origin: unquote($origin);
-  // webkit and mozilla use the deprecated short [border | padding | content]
-  $deprecated: $origin;
-  @if $origin == padding-box { $deprecated: padding; }
-  @if $origin == border-box  { $deprecated: border;  }
-  @if $origin == content-box { $deprecated: content; }
-
-  // Support for webkit and mozilla's use of the deprecated short form
-  @include experimental(background-origin, $deprecated,
-    -moz,
-    -webkit,
-    not -o,
-    not -ms,
-    not -khtml,
-    not official
-  );
-  @include experimental(background-origin, $origin,
-    not -moz,
-    not -webkit,
-    -o,
-    -ms,
-    -khtml,
-    official
+// ----------------------------------------------------------------------------
+// Mixin
+
+// Set the origin of the background (image and color) at the edge of the padding, border, or content.
+//   $origin... : [padding-box | border-box | content-box]
+@mixin background-origin($origin...) {
+  $output: compact();
+  $deprecated: compact();
+
+  @if (length($origin) > 0) {
+    @each $layer in $origin {
+      $output: append($output, unquote($layer));
+      $deprecated: append($deprecated, legacy-box($layer));
+    }
+  } @else {
+    $output: $default-background-origin;
+    $deprecated: legacy-box($default-background-origin);
+  }
+
+  // Legacy versions of Mozilla support a different syntax, prefixed.
+  @include experimental-only-for(background-origin, $deprecated,
+    $moz: $legacy-support-for-mozilla,
+    $webkit: $legacy-support-for-webkit
   );
+
+  // Official syntax for the rest
+  @include experimental(background-origin, $output, $background-origin-support...);
 }

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

@@ -1,26 +1,26 @@
 @import "shared";
 
+// ----------------------------------------------------------------------------
+// @private css3-feature-support variables must always include a list of five boolean values
+// representing in order: -moz, -webkit, -o, -ms, -khtml
+//   - mozilla/webkit legacy support handled seperately below
+$background-size-support: moz, -webkit, -o, not -ms, -khtml;
+
+// ----------------------------------------------------------------------------
+// Default
+
 //  override to change the default
 $default-background-size: 100% auto !default;
 
+// ----------------------------------------------------------------------------
+// Mixin
+
 // Set the size of background images using px, width and height, or percentages.
 // Currently supported in: Opera, Gecko, Webkit.
 //
 // * percentages are relative to the background-origin (default = padding-box)
 // * mixin defaults to: `$default-background-size`
-@mixin background-size(
-  $size-1: $default-background-size,
-  $size-2: false,
-  $size-3: false,
-  $size-4: false,
-  $size-5: false,
-  $size-6: false,
-  $size-7: false,
-  $size-8: false,
-  $size-9: false,
-  $size-10: false
-) {
-  $size-1: if(type-of($size-1) == string, unquote($size-1), $size-1);
-  $sizes: compact($size-1, $size-2, $size-3, $size-4, $size-5, $size-6, $size-7, $size-8, $size-9, $size-10);
-  @include experimental(background-size, $sizes, -moz, -webkit, -o, not -ms, not -khtml);
+@mixin background-size($size...) {
+  $size: set-arglist-default($size, $default-background-size);
+  @include experimental(background-size, $size, $background-size-support...);
 }

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

@@ -1,7 +1,19 @@
 @import "shared";
 
+// ----------------------------------------------------------------------------
+// @private css3-feature-support variables must always include a list of five boolean values
+// representing in order: -moz, -webkit, -o, -ms, -khtml
+$border-radius-support: not -moz, not -webkit, not -o, not -ms, -khtml;
+
+// ----------------------------------------------------------------------------
+// Default
+
+// The length of a border-radius to be used by default.
 $default-border-radius: 5px !default;
 
+// ----------------------------------------------------------------------------
+// Mixins
+
 // Round all corners by a specific amount, defaults to value of `$default-border-radius`.
 //
 // When two values are passed, the first is the horizontal radius
@@ -23,89 +35,59 @@ $default-border-radius: 5px !default;
 //      -moz-border-radius: 4px / 4px;
 //      -khtml-border-radius: 4px / 4px;
 //      border-radius: 4px / 4px; }
-//    
+//
 //    .compound {
 //      -webkit-border-radius: 2px 3px;
 //      -moz-border-radius: 2px 5px / 3px 6px;
 //      -khtml-border-radius: 2px 5px / 3px 6px;
 //      border-radius: 2px 5px / 3px 6px; }
-//    
+//
 //    .crazy {
 //      -webkit-border-radius: 1px 2px;
 //      -moz-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
 //      -khtml-border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px;
 //      border-radius: 1px 3px 5px 7px / 2px 4px 6px 8px; }
-
 @mixin border-radius($radius: $default-border-radius, $vertical-radius: false) {
 
-  @if $vertical-radius {
-    // Webkit doesn't understand the official shorthand syntax for specifying
-    // a vertical radius unless so in case there's several we only take the first.
-    @include experimental(border-radius, first-value-of($radius) first-value-of($vertical-radius),
-      not -moz,
-      -webkit,
-      not -o,
-      not -ms,
-      not -khtml,
-      not official
-    );
-    @include experimental("border-radius", $radius unquote("/") $vertical-radius,
-      -moz,
-      not -webkit,
-      not -o,
-      not -ms,
-      -khtml,
-      official
-    );
-  }
-  @else {
-    @include experimental(border-radius, $radius);
-  }
+  // Legacy Webkit didn't understand the official shorthand syntax for specifying a vertical radius.
+  $legacy-webkit-radius: first-value-of($radius);
+  @if $vertical-radius { $legacy-webkit-radius: append($legacy-webkit-radius, first-value-of($vertical-radius)); }
+  @include experimental-only-for(border-radius, $legacy-webkit-radius, $webkit: $legacy-support-for-webkit);
+
+  // Official syntax for everyone else
+  $radius: if($vertical-radius, #{$radius} / #{$vertical-radius}, $radius);
+  @include experimental-only-for(border-radius, $radius, $moz: $legacy-support-for-mozilla);
+  @include experimental(border-radius, $radius, $border-radius-support...);
 }
 
 // Round radius at position by amount.
 //
 // * legal values for `$vert`: `top`, `bottom`
 // * legal values for `$horz`: `left`, `right`
-
 @mixin border-corner-radius($vert, $horz, $radius: $default-border-radius) {
+
   // Support for mozilla's syntax for specifying a corner
-  @include experimental("border-radius-#{$vert}#{$horz}", $radius,
-    -moz,
-    not -webkit,
-    not -o,
-    not -ms,
-    not -khtml,
-    not official
-  );
-  @include experimental("border-#{$vert}-#{$horz}-radius", $radius,
-    not -moz,
-    -webkit,
-    not -o,
-    not -ms,
-    -khtml,
-    official
-  );
-  
+  @include experimental-only-for("border-radius-#{$vert}#{$horz}", $radius, $moz: $legacy-support-for-mozilla);
+
+  // Official syntax for everyone else
+  $corners: "border-#{$vert}-#{$horz}-radius";
+  @include experimental-only-for($corners, $radius, $webkit: $legacy-support-for-webkit);
+  @include experimental($corners, $radius, $border-radius-support...);
 }
 
 // Round top-left corner only
-
 @mixin border-top-left-radius($radius: $default-border-radius) {
   @include border-corner-radius(top, left, $radius); }
 
 // Round top-right corner only
-
 @mixin border-top-right-radius($radius: $default-border-radius) {
   @include border-corner-radius(top, right, $radius); }
 
 // Round bottom-left corner only
-
 @mixin border-bottom-left-radius($radius: $default-border-radius) {
   @include border-corner-radius(bottom, left, $radius); }
 
 // Round bottom-right corner only
-
 @mixin border-bottom-right-radius($radius: $default-border-radius) {
   @include border-corner-radius(bottom, right, $radius); }
 

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

@@ -1,10 +1,17 @@
+@import "shared";
+
+// ----------------------------------------------------------------------------
+// @private css3-feature-support variables must always include a list of five boolean values
+// representing in order: -moz, -webkit, -o, -ms, -khtml
+$box-shadow-support: -moz, -webkit, not -o, not -ms, not -khtml;
+
 // @doc off
 // These defaults make the arguments optional for this mixin
 // If you like, set different defaults before importing.
 // @doc on
 
-@import "shared";
-
+// ----------------------------------------------------------------------------
+// Defaults
 
 // The default color for box shadows
 $default-box-shadow-color: #333333 !default;
@@ -24,46 +31,34 @@ $default-box-shadow-spread : false !default;
 // The default shadow inset: inset or false (for standard shadow).
 $default-box-shadow-inset : false !default;
 
-// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows when one or more box
-// shadows are needed.
-// Each shadow argument should adhere to the standard css3 syntax for the
-// box-shadow property.
-@mixin box-shadow(
-  $shadow-1 : default,
-  $shadow-2 : false,
-  $shadow-3 : false,
-  $shadow-4 : false,
-  $shadow-5 : false,
-  $shadow-6 : false,
-  $shadow-7 : false,
-  $shadow-8 : false,
-  $shadow-9 : false,
-  $shadow-10: false
-) {
-  @if $shadow-1 == default {
-    $shadow-1 : -compass-space-list(compact(if($default-box-shadow-inset, inset, false), $default-box-shadow-h-offset, $default-box-shadow-v-offset, $default-box-shadow-blur, $default-box-shadow-spread, $default-box-shadow-color));
-  }
-  $shadow : compact($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10);
-  @include experimental(box-shadow, $shadow,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
-  );
+// ----------------------------------------------------------------------------
+// Mixins
+
+// Provides cross-browser for Webkit, Gecko, and CSS3 box shadows
+// when one or more box shadows are needed.
+// Each shadow argument should adhere to the standard css3 syntax
+// for the box-shadow property.
+@mixin box-shadow($shadow...) {
+  $default: -compass-space-list(compact(if($default-box-shadow-inset, inset, false), $default-box-shadow-h-offset, $default-box-shadow-v-offset, $default-box-shadow-blur, $default-box-shadow-spread, $default-box-shadow-color));
+  $shadow: set-arglist-default($shadow, $default);
+  @include experimental(box-shadow, $shadow, $box-shadow-support...);
 }
 
 // Provides a single cross-browser CSS box shadow for Webkit, Gecko, and CSS3.
 // Includes default arguments for color, horizontal offset, vertical offset, blur length, spread length, and inset.
 @mixin single-box-shadow(
-  $color  : $default-box-shadow-color,
   $hoff   : $default-box-shadow-h-offset,
   $voff   : $default-box-shadow-v-offset,
   $blur   : $default-box-shadow-blur,
   $spread : $default-box-shadow-spread,
+  $color  : $default-box-shadow-color,
   $inset  : $default-box-shadow-inset
 ) {
   @if not ($inset == true or $inset == false or $inset == inset) {
     @warn "$inset expected to be true or the inset keyword. Got #{$inset} instead. Using: inset";
   }
 
-  @if $color == none {
+  @if $hoff == none {
     @include box-shadow(none);
   } @else {
     $full   : $hoff $voff;

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

@@ -1,13 +1,18 @@
 @import "shared";
 
+// ----------------------------------------------------------------------------
+// @private css3-feature-support variables must always include a list of five boolean values
+// representing in order: -moz, -webkit, -o, -ms, -khtml
+$box-sizing-support:  -moz, -webkit, not -o, not -ms, not -khtml;
+
+// ----------------------------------------------------------------------------
+// Mixin
+
 // Change the box model for Mozilla, Webkit, IE8 and the future
 //
-// @param $bs
-//   [ content-box | border-box ]
-
-@mixin box-sizing($bs) {
-  $bs: unquote($bs);
-  @include experimental(box-sizing, $bs,
-    -moz, -webkit, not -o, not -ms, not -khtml, official
-  );
+// @param $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...);
 }

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

@@ -1,111 +1,89 @@
 @import "shared";
 
-// display:box; must be used for any of the other flexbox mixins to work properly
-@mixin display-box {
-  @include experimental-value(display, box,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
-}
+// ----------------------------------------------------------------------------
+// @private css3-feature-support variables must always include a list of five boolean values
+// representing in order: -moz, -webkit, -o, -ms, -khtml
+$flexbox-support: -moz, -webkit, not -o, -ms, not -khtml;
+
+// ----------------------------------------------------------------------------
+// Defaults
 
 // Default box orientation, assuming that the user wants something less block-like
 $default-box-orient: horizontal !default;
 
+// Default box-align
+$default-box-align: stretch !default;
+
+// Default box flex
+$default-box-flex: 0 !default;
+
+// Default flex group
+$default-box-flex-group: 1 !default;
+
+// Box direction default value
+$default-box-direction: normal !default;
+
+// Default ordinal group
+$default-box-ordinal-group: 1 !default;
+
+// Default box lines
+$default-box-lines: single !default;
+
+// Default box pack
+$default-box-pack: start !default;
+
+// ----------------------------------------------------------------------------
+// Mixins
+
+// 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...);
+}
+
 // Box orientation [ horizontal | vertical | inline-axis | block-axis | inherit ]
-@mixin box-orient(
-  $orientation: $default-box-orient
-) {
+@mixin box-orient($orientation: $default-box-orient) {
   $orientation : unquote($orientation);
-  @include experimental(box-orient, $orientation,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+  @include experimental(box-orient, $orientation, $flexbox-support...);
 }
 
-// Default box-align
-$default-box-align: stretch !default;
-
 // Box align [ start | end | center | baseline | stretch ]
-@mixin box-align(
-  $alignment: $default-box-align
-) {
+@mixin box-align($alignment: $default-box-align) {
   $alignment : unquote($alignment);
-  @include experimental(box-align, $alignment,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+  @include experimental(box-align, $alignment, $flexbox-support...);
 }
 
-// Default box flex
-$default-box-flex: 0 !default;
-
-// mixin which takes an int argument for box flex. Apply this to the children inside the box.
+// 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,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+@mixin box-flex($flex: $default-box-flex) {
+  @include experimental(box-flex, $flex, $flexbox-support...);
 }
 
-// Default flex group
-$default-box-flex-group: 1 !default;
-
-// mixin which takes an int argument for flexible grouping
-@mixin box-flex-group(
-  $group: $default-box-flex-group
-) {
-  @include experimental(box-flex-group, $group,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+// Takes an int argument for flexible grouping
+@mixin box-flex-group($group: $default-box-flex-group) {
+  @include experimental(box-flex-group, $group, $flexbox-support...);
 }
 
-// default for ordinal group
-$default-box-ordinal-group: 1 !default;
-
-// mixin which takes an int argument for ordinal grouping and rearranging the order
-@mixin box-ordinal-group(
-  $group: $default-ordinal-flex-group
-) {
-  @include experimental(box-ordinal-group, $group,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+// Takes an int argument for ordinal grouping and rearranging the order
+@mixin box-ordinal-group($group: $default-ordinal-flex-group) {
+  @include experimental(box-ordinal-group, $group, $flexbox-support...);
 }
 
-// Box direction default value
-$default-box-direction: normal !default;
-
-// mixin for box-direction [ normal | reverse | inherit ]
-@mixin box-direction(
-  $direction: $default-box-direction
-) {
+// Box direction [ normal | reverse | inherit ]
+@mixin box-direction($direction: $default-box-direction) {
   $direction: unquote($direction);
-  @include experimental(box-direction, $direction,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+  @include experimental(box-direction, $direction, $flexbox-support...);
 }
 
-// default for box lines
-$default-box-lines: single !default;
-
-// mixin for box lines [ single | multiple ]
-@mixin box-lines(
-  $lines: $default-box-lines
-) {
+// Box lines [ single | multiple ]
+@mixin box-lines($lines: $default-box-lines) {
   $lines: unquote($lines);
-  @include experimental(box-lines, $lines,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
+  @include experimental(box-lines, $lines, $flexbox-support...);
 }
 
-// default for box pack
-$default-box-pack: start !default;
-
-// mixin for box pack [ start | end | center | justify ]
-@mixin box-pack(
-  $pack: $default-box-pack
-) {
+// Box pack [ start | end | center | justify ]
+@mixin box-pack($pack: $default-box-pack) {
   $pack: unquote($pack);
-  @include experimental(box-pack, $pack,
-    -moz, -webkit, not -o, -ms, not -khtml, official
-  );
-}
+  @include experimental(box-pack, $pack, $flexbox-support...);
+}