github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #810 from doctyper/prefixed-transition-properties

Browse Source 
Remove stray commas when default transition properties are used
This commit is contained in:
Scott Davis 2012-03-30 06:10:05 -07:00
commit 0c13d98cb4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/compass/stylesheets/compass/css3/_transition.scss
View File

@ -95,7 +95,7 @@ $transitionable-prefixed-values: transform, transform-origin !default;
$transition-10: false $transition-10: false
) { ) {
@if $transition-1 == default { @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); $transition : compact($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10);

7
test/fixtures/stylesheets/compass/css/transition.css vendored
View File

@ -69,3 +69,10 @@
-ms-transition-property: opacity, -ms-transform, left; -ms-transition-property: opacity, -ms-transform, left;
-o-transition-property: opacity, -o-transform, left; -o-transition-property: opacity, -o-transform, left;
transition-property: opacity, 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; }

1
test/fixtures/stylesheets/compass/sass/transition.scss vendored
View File

@ -10,3 +10,4 @@
.multiple-transitions { @include transition(transform 0.6s ease-out, opacity 0.2s ease-in) } .multiple-transitions { @include transition(transform 0.6s ease-out, opacity 0.2s ease-in) }
.transition-property { @include transition-property(transform); } .transition-property { @include transition-property(transform); }
.multiple-transition-properties { @include transition-property((opacity, transform, left)); } .multiple-transition-properties { @include transition-property((opacity, transform, left)); }
.default-transition { @include transition(); }