From 8a45ed8961bb604be48ea19d13674750552343f3 Mon Sep 17 00:00:00 2001 From: Richard Herrera Date: Sat, 24 Mar 2012 13:07:00 -0700 Subject: [PATCH] Addresses Issue #805: Stray commas added when default transition values are used. Test case included. --- .../compass/stylesheets/compass/css3/_transition.scss | 2 +- test/fixtures/stylesheets/compass/css/transition.css | 7 +++++++ test/fixtures/stylesheets/compass/sass/transition.scss | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frameworks/compass/stylesheets/compass/css3/_transition.scss b/frameworks/compass/stylesheets/compass/css3/_transition.scss index f220d512..183ab35d 100644 --- a/frameworks/compass/stylesheets/compass/css3/_transition.scss +++ b/frameworks/compass/stylesheets/compass/css3/_transition.scss @@ -95,7 +95,7 @@ $transitionable-prefixed-values: transform, transform-origin !default; $transition-10: false ) { @if $transition-1 == default { - $transition-1 : (compact($default-transition-property, $default-transition-duration, $default-transition-function, $default-transition-delay)); + $transition-1 : compact($default-transition-property $default-transition-duration $default-transition-function $default-transition-delay); } $transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10); diff --git a/test/fixtures/stylesheets/compass/css/transition.css b/test/fixtures/stylesheets/compass/css/transition.css index b9b21aea..d82b2dee 100644 --- a/test/fixtures/stylesheets/compass/css/transition.css +++ b/test/fixtures/stylesheets/compass/css/transition.css @@ -69,3 +69,10 @@ -ms-transition-property: opacity, -ms-transform, left; -o-transition-property: opacity, -o-transform, left; transition-property: opacity, transform, left; } + +.default-transition { + -webkit-transition: all 1s; + -moz-transition: all 1s; + -ms-transition: all 1s; + -o-transition: all 1s; + transition: all 1s; } diff --git a/test/fixtures/stylesheets/compass/sass/transition.scss b/test/fixtures/stylesheets/compass/sass/transition.scss index 16add41a..1a8f1e5e 100644 --- a/test/fixtures/stylesheets/compass/sass/transition.scss +++ b/test/fixtures/stylesheets/compass/sass/transition.scss @@ -10,3 +10,4 @@ .multiple-transitions { @include transition(transform 0.6s ease-out, opacity 0.2s ease-in) } .transition-property { @include transition-property(transform); } .multiple-transition-properties { @include transition-property((opacity, transform, left)); } +.default-transition { @include transition(); }