fix regression in the transform api

twalpole · Nov 21, 2010 · ad7f2eb · ad7f2eb
1 parent b9c68bc
commit ad7f2eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frameworks/compass/stylesheets/compass/css3/_transform-v2.scss b/frameworks/compass/stylesheets/compass/css3/_transform-v2.scss
@@ -110,7 +110,7 @@ $default-skew-y      : 5deg                  !default;
   $origin-x: $default-origin-x,
   $origin-y: $default-origin-y,
   $origin-z: false,
-  $only3d:   false
+  $only3d:   if($origin-z)
 ) {
   $origin: unquote('');
   @if $origin-x or $origin-y or $origin-z {

diff --git a/lib/compass/sass_extensions/functions/if.rb b/lib/compass/sass_extensions/functions/if.rb
@@ -1,7 +1,7 @@
 module Compass::SassExtensions::Functions::If
-  def if(truth, if_true, if_false = nil)
+  def if(truth, if_true = nil, if_false = nil)
     if truth.to_bool
-      if_true
+      if_true || Sass::Script::Bool.new(true)
     else
       if_false || Sass::Script::Bool.new(false)
     end