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

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

@@ -1,262 +1,5 @@
-@import "compass/support";
+@warn "The compass/css3/shared module has been deprecated.
+You can silence this warning by importing compass/css3/deprecated-support instead.
+Please be aware that module will be removed in the next release.";
 
-// 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,
-  $ms       : $experimental-support-for-microsoft,
-  $o        : $experimental-support-for-opera,
-  $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,
-  $ms       : false,
-  $o        : 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,
-  $ms       : $experimental-support-for-microsoft,
-  $o        : $experimental-support-for-opera,
-  $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}; }
-}
-
-// 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
-          #{'$microsoft-'}$experimental-support-for-microsoft
-          #{'$opera-'}$experimental-support-for-opera
-          #{'$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-microsoft
-          $experimental-support-for-opera
-          $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,
-  $ms     : false,
-  $o      : false,
-  $khtml  : false
-) {
-  $experimental-support-for-mozilla   : $moz;
-  $experimental-support-for-webkit    : $webkit;
-  $experimental-support-for-microsoft : $ms;
-  $experimental-support-for-opera     : $o;
-  $experimental-support-for-khtml     : $khtml;
-}
-
-@mixin capture-and-set-experimental(
-  $moz    : false,
-  $webkit : false,
-  $ms     : false,
-  $o      : false,
-  $khtml  : false
-) {
-  @include capture-experimental-matrix;
-  @include set-experimental-support($moz, $webkit, $ms, $o, $khtml);
-}
-
-@mixin capture-and-adjust-experimental(
-  $moz    : $experimental-support-for-mozilla,
-  $webkit : $experimental-support-for-webkit,
-  $ms     : $experimental-support-for-microsoft,
-  $o      : $experimental-support-for-opera,
-  $khtml  : $experimental-support-for-khtml
-) {
-  @include capture-experimental-matrix;
-  @include set-experimental-support($moz, $webkit, $ms, $o, $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,
-  $ms     : false,
-  $o      : 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, $ms, $o, $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,
-  $ms         : $experimental-support-for-microsoft,
-  $o          : $experimental-support-for-opera,
-  $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, $ms, $o, $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,
-  $ms     : false,
-  $o      : 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, $ms, $o, $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,
-    $ms         : $experimental-support-for-microsoft,
-    $o          : $experimental-support-for-opera,
-    $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, $ms, $o, $khtml, $ie6, $ie7, $ie8) {
-    @content;
-  }
-}
-
-// Set a default value if the given arglist is empty
-@function set-arglist-default(
-  $arglist,
-  $default
-) {
-  $default: if(length($default) > 0, $default, null);
-  $output: compact();
-  @each $layer in $arglist {
-    $output: append($output, if($layer == 'default', $default, $layer));
-  }
-  @return if(length($output) > 0, $output, $default);
-}
-
-// @private Returns the legacy value for a given box-model
-// - Used by background-clip and -origin.
-@function legacy-box($box) {
-  $box: unquote($box);
-  @if $box == padding-box { $box: padding; }
-  @if $box == border-box { $box: border; }
-  @if $box == content-box { $box: content; }
-  @return $box;
-}
+@import "deprecated-support";

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

@@ -1,6 +1,6 @@
 // Text Shadow
 
-@import "shared";
+@import "compass/support";
 
 
 // These defaults make the arguments optional for this mixin

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

@@ -1,4 +1,7 @@
-@import "shared";
+@import "compass/support";
+
+// The the user threshold for transform support. Defaults to `$graceful-usage-threshold`
+$transform-support-threshold: $graceful-usage-threshold;
 
 // @doc off
 // Note ----------------------------------------------------------------------
@@ -101,16 +104,10 @@ $default-skew-y      : 5deg                  !default;
 // @param only3d Set this to true to only apply this
 // mixin where browsers have 3D support.
 @mixin apply-origin($origin, $only3d) {
-  $only3d: $only3d or -compass-list-size(-compass-list($origin)) > 2;
-  @if $only3d {
-    @include experimental(transform-origin, $origin,
-      -moz, -webkit, -ms, -o, not -khtml, official
-    );
-  } @else {
-    @include experimental(transform-origin, $origin,
-      -moz, -webkit, -ms, -o, not -khtml, official
-    );
-  }
+  $capability: if($only3d or length($origin) > 2, transforms3d, transforms2d);
+  @include prefixed-properties($capability, $transform-support-threshold, (
+    transform-origin: $origin
+  ));
 }
 
 // Transform-origin sent as individual arguments:
@@ -145,15 +142,10 @@ $default-skew-y      : 5deg                  !default;
   $transform,
   $only3d: false
 ) {
-  @if $only3d {
-    @include experimental(transform, $transform,
-      -moz, -webkit, -ms, -o, not -khtml, official
-    );
-  } @else {
-    @include experimental(transform, $transform,
-      -moz, -webkit, -ms, -o, not -khtml, official
-    );
-  }
+  $capability: if($only3d, transforms3d, transforms2d);
+  @include prefixed-properties($capability, $transform-support-threshold, (
+    transform: $transform
+  ));
 }
 
 // Shortcut to target all browsers with 2D transform support
@@ -178,9 +170,9 @@ $default-skew-y      : 5deg                  !default;
 // z-axis. The higher the perspective, the more exaggerated the foreshortening.
 // values from 500 to 1000 are more-or-less "normal" - a good starting-point.
 @mixin perspective($p) {
-  @include experimental(perspective, $p,
-    -moz, -webkit, -ms, -o, not -khtml, official
-  );
+  @include prefixed-properties(transforms3d, $transform-support-threshold, (
+    perspective: $p
+  ));
 }
 
 // Set the origin position for the perspective
@@ -189,9 +181,9 @@ $default-skew-y      : 5deg                  !default;
 //
 // where the two arguments represent x/y coordinates
 @mixin perspective-origin($origin: 50%) {
-  @include experimental(perspective-origin, $origin,
-    -moz, -webkit, -ms, -o, not -khtml, official
-  );
+  @include prefixed-properties(transforms3d, $transform-support-threshold, (
+    perspective-origin: $origin
+  ));
 }
 
 // Determine whether a 3D objects children also live in the given 3D space
@@ -201,9 +193,9 @@ $default-skew-y      : 5deg                  !default;
 // where `style` can be either `flat` or `preserve-3d`.
 // Browsers default to `flat`, mixin defaults to `preserve-3d`.
 @mixin transform-style($style: preserve-3d) {
-  @include experimental(transform-style, $style,
-    -moz, -webkit, -ms, -o, not -khtml, official
-  );
+  @include prefixed-properties(transforms3d, $transform-support-threshold, (
+    transform-style: $style
+  ));
 }
 
 // Determine the visibility of an element when it's back is turned
@@ -213,9 +205,9 @@ $default-skew-y      : 5deg                  !default;
 // where `visibility` can be either `visible` or `hidden`.
 // Browsers default to visible, mixin defaults to hidden
 @mixin backface-visibility($visibility: hidden) {
-  @include experimental(backface-visibility, $visibility,
-    -moz, -webkit, -ms, -o, not -khtml, official
-  );
+  @include prefixed-properties(transforms3d, $transform-support-threshold, (
+    backface-visibility: $visibility
+  ));
 }
 
 // @doc off

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

@@ -1,4 +1,8 @@
-@import "shared";
+@import "compass/support";
+
+// The the user threshold for transition support. Defaults to `$graceful-usage-threshold`
+$transition-support-threshold: $graceful-usage-threshold !default;
+
 
 // CSS Transitions
 // Currently only works in Webkit.
@@ -19,34 +23,50 @@ $default-transition-property: all !default;
 
 $default-transition-duration: 1s !default;
 
-$default-transition-function: false !default;
+$default-transition-function: null !default;
 
-$default-transition-delay: false !default;
+$default-transition-delay: null !default;
 
 $transitionable-prefixed-values: transform, transform-origin !default;
 
+
+
+// Checks if the value given is a unit of time.
+@function is-time($value) {
+  @return if(type-of($value) == number, not not index(s ms, unit($value)), false);
+}
+
+// Returns `$property` with the given prefix if it is found in `$transitionable-prefixed-values`.
+@function prefixed-for-transition($prefix, $property) {
+  @if not $prefix {
+    @return $property;
+  }
+  @if type-of($property) == list or type-of($property) == arglist {
+    $new-list: comma-list();
+    @each $v in $property {
+      $new-list: append($new-list, prefixed-for-transition($prefix, $v));
+    }
+    @return $new-list;
+  } @else {
+    @if index($transitionable-prefixed-values, $property) {
+      @return #{$prefix}-#{$property};
+    } @else {
+      @return $property;
+    }
+  }
+}
+
 // One or more properties to transition
 //
 // * for multiple, use a comma-delimited list
 // * also accepts "all" or "none"
 
-@mixin transition-property($property-1: $default-transition-property,
-  $property-2 : false,
-  $property-3 : false,
-  $property-4 : false,
-  $property-5 : false,
-  $property-6 : false,
-  $property-7 : false,
-  $property-8 : false,
-  $property-9 : false,
-  $property-10: false
-) {
-  @if type-of($property-1) == string { $property-1: unquote($property-1); }
-  $properties: compact($property-1, $property-2, $property-3, $property-4, $property-5, $property-6, $property-7, $property-8, $property-9, $property-10);
-  @if $experimental-support-for-webkit    {       -webkit-transition-property : prefixed-for-transition(-webkit, $properties); }
-  @if $experimental-support-for-mozilla   {          -moz-transition-property : prefixed-for-transition(-moz,    $properties); }
-  @if $experimental-support-for-opera     {            -o-transition-property : prefixed-for-transition(-o,      $properties); }
-                                                          transition-property : $properties;
+@mixin transition-property($properties...) {
+  $properties: set-arglist-default($properties, $default-transition-property);
+  @include with-each-prefix(css-transitions, $transition-support-threshold) {
+    $props: if($current-prefix, prefixed-for-transition($current-prefix, $properties), $properties);
+    @include prefix-prop(transition-property, $props);
+  }
 }
 
 // One or more durations in seconds
@@ -54,22 +74,11 @@ $transitionable-prefixed-values: transform, transform-origin !default;
 // * for multiple, use a comma-delimited list
 // * these durations will affect the properties in the same list position
 
-@mixin transition-duration($duration-1: $default-transition-duration,
-  $duration-2 : false,
-  $duration-3 : false,
-  $duration-4 : false,
-  $duration-5 : false,
-  $duration-6 : false,
-  $duration-7 : false,
-  $duration-8 : false,
-  $duration-9 : false,
-  $duration-10: false
-) {
-  @if type-of($duration-1) == string { $duration-1: unquote($duration-1); }
-  $durations: compact($duration-1, $duration-2, $duration-3, $duration-4, $duration-5, $duration-6, $duration-7, $duration-8, $duration-9, $duration-10);
-  @include experimental(transition-duration, $durations,
-    -moz, -webkit, not -ms, -o, not -khtml, official
-  );
+@mixin transition-duration($durations...) {
+  $durations: set-arglist-default($durations, $default-transition-duration);
+  @include prefixed-properties(css-transitions, $transition-support-threshold, (
+    transition-duration: $durations
+  ));
 }
 
 // One or more timing functions
@@ -78,22 +87,11 @@ $transitionable-prefixed-values: transform, transform-origin !default;
 // * For multiple, use a comma-delimited list
 // * These functions will effect the properties in the same list position
 
-@mixin transition-timing-function($function-1: $default-transition-function,
-  $function-2 : false,
-  $function-3 : false,
-  $function-4 : false,
-  $function-5 : false,
-  $function-6 : false,
-  $function-7 : false,
-  $function-8 : false,
-  $function-9 : false,
-  $function-10: false
-) {
-  $function-1: unquote($function-1);
-  $functions: compact($function-1, $function-2, $function-3, $function-4, $function-5, $function-6, $function-7, $function-8, $function-9, $function-10);
-  @include experimental(transition-timing-function, $functions,
-    -moz, -webkit, not -ms, -o, not -khtml, official
-  );
+@mixin transition-timing-function($functions...) {
+  $functions: set-arglist-default($functions, $default-transition-function);
+  @include prefixed-properties(css-transitions, $transition-support-threshold, (
+    transition-timing-function: $functions
+  ));
 }
 
 // One or more transition-delays in seconds
@@ -101,22 +99,11 @@ $transitionable-prefixed-values: transform, transform-origin !default;
 // * for multiple, use a comma-delimited list
 // * these delays will effect the properties in the same list position
 
-@mixin transition-delay($delay-1: $default-transition-delay,
-  $delay-2 : false,
-  $delay-3 : false,
-  $delay-4 : false,
-  $delay-5 : false,
-  $delay-6 : false,
-  $delay-7 : false,
-  $delay-8 : false,
-  $delay-9 : false,
-  $delay-10: false
-) {
-  @if type-of($delay-1) == string { $delay-1: unquote($delay-1); }
-  $delays: compact($delay-1, $delay-2, $delay-3, $delay-4, $delay-5, $delay-6, $delay-7, $delay-8, $delay-9, $delay-10);
-  @include experimental(transition-delay, $delays,
-    -moz, -webkit, not -ms, -o, not -khtml, official
-  );
+@mixin transition-delay($delays...) {
+  $delays: set-arglist-default($delays, $default-transition-delay);
+  @include prefixed-properties(css-transitions, $transition-support-threshold, (
+    transition-delay: $delays
+  ));
 }
 
 // Transition all-in-one shorthand
@@ -130,92 +117,55 @@ $transitionable-prefixed-values: transform, transform-origin !default;
   @include transition(compact($property $duration $function $delay));
 }
 
-@mixin transition(
-  $transition-1 : default,
-  $transition-2 : false,
-  $transition-3 : false,
-  $transition-4 : false,
-  $transition-5 : false,
-  $transition-6 : false,
-  $transition-7 : false,
-  $transition-8 : false,
-  $transition-9 : false,
-  $transition-10: false
-) {
-  @if $transition-1 == default {
-    $transition-1 : compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay);
-  }
-  $transitions: false;
-  @if type-of($transition-1) == list and type-of(nth($transition-1,1)) == list {
-    $transitions: join($transition-1, compact($transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10), comma);
-  } @else {
-    $transitions : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);
-  }
-  $delays: comma-list();
-  $has-delays: false;
-  $webkit-value: comma-list();
-  $moz-value: comma-list();
-  $o-value: comma-list();
-
-  // This block can be made considerably simpler at the point in time that
-  // we no longer need to deal with the differences in how delays are treated.
-  @each $transition in $transitions {
-    // Extract the values from the list
-    // (this would be cleaner if nth took a 3rd argument to provide a default value).
-    $property: nth($transition, 1);
-    $duration: false;
-    $timing-function: false;
-    $delay: false;
-    @if length($transition) > 1 { $duration:        nth($transition, 2); }
-    @if length($transition) > 2 { $timing-function: nth($transition, 3); }
-    @if length($transition) > 3 { $delay:           nth($transition, 4); $has-delays: true; }
-
-    // If a delay is provided without a timing function
-    @if is-time($timing-function) and not $delay { $delay: $timing-function; $timing-function: false; $has-delays: true; }
-
-    // Keep a list of delays in case one is specified
-    $delays: append($delays, if($delay, $delay, 0s));
-
-    $webkit-value: append($webkit-value, compact(prefixed-for-transition(-webkit, $property) $duration $timing-function));
-       $moz-value: append(   $moz-value, compact(prefixed-for-transition(   -moz, $property) $duration $timing-function $delay));
-         $o-value: append(     $o-value, compact(prefixed-for-transition(     -o, $property) $duration $timing-function $delay));
-  }
-
-  @if $experimental-support-for-webkit    {       -webkit-transition : $webkit-value;
-    // old webkit doesn't support the delay parameter in the shorthand so we progressively enhance it.
-    @if $has-delays                       { -webkit-transition-delay : $delays;       } }
-  @if $experimental-support-for-mozilla   {          -moz-transition : $moz-value;    }
-  @if $experimental-support-for-opera     {            -o-transition : $o-value;      }
-                                                          transition : $transitions;
-}
-
-// coerce a list to be comma delimited or make a new, empty comma delimited list.
-@function comma-list($list: ()) {
-  @return join((), $list, comma);
-}
-
-// Returns `$property` with the given prefix if it is found in `$transitionable-prefixed-values`.
-@function prefixed-for-transition($prefix, $property) {
-  @if type-of($property) == list {
-    $new-list: comma-list();
-    @each $v in $property {
-      $new-list: append($new-list, prefixed-for-transition($prefix, $v));
+@mixin transition($transitions...) {
+  $default: compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay);
+  $transitions: set-arglist-default($transitions, $default);
+
+  @include with-each-prefix(css-transitions, $transition-support-threshold) {
+    $delays: ();
+    $transitions-without-delays: ();
+    $transitions-with-delays: ();
+    $has-delays: false;
+
+
+    // This block can be made considerably simpler at the point in time that
+    // we no longer need to deal with the differences in how delays are treated.
+    @each $transition in $transitions {
+      // Extract the values from the list
+      // (this would be cleaner if nth took a 3rd argument to provide a default value).
+      $property: nth($transition, 1);
+      $duration: if(length($transition) >= 2, nth($transition, 2), null);
+      $timing-function: if(length($transition) >= 3, nth($transition, 3), null);
+      $delay: if(length($transition) >= 4, nth($transition, 4), null);
+      $has-delays: $has-delays or $delay;
+
+      // If a delay is provided without a timing function
+      @if is-time($timing-function) and not $delay {
+        $delay: $timing-function;
+        $timing-function: null;
+        $has-delays: true;
+      }
+
+      @if $current-prefix == -webkit {
+        // Keep a list of delays in case one is specified
+        $delays: append($delays, if($delay, $delay, 0s));
+        $transitions-without-delays: append($transitions-without-delays,
+          prefixed-for-transition($current-prefix, $property) $duration $timing-function);
+      } @else {
+        $transitions-with-delays: append($transitions-with-delays,
+          prefixed-for-transition($current-prefix, $property) $duration $timing-function $delay);
+      }
     }
-    @return $new-list;
-  } @else {
-    @if index($transitionable-prefixed-values, $property) {
-      @return #{$prefix}-#{$property};
+
+    @if $current-prefix == -webkit {
+      @include prefix-prop(transition, $transitions-without-delays);
+      @if $has-delays {
+        @include prefix-prop(transition-delay, $delays);
+      }
+    } @else if $current-prefix {
+      @include prefix-prop(transition, $transitions-with-delays);
     } @else {
-      @return $property;
+      transition: $transitions-with-delays;
     }
   }
 }
-
-// Checks if the value given is a unit of time.
-@function is-time($value) {
-  @if type-of($value) == number {
-    @return not not index(s ms, unit($value));
-  } @else {
-    @return false;
-  }
-}