From ad7f2eb9800e0fcdccd22183e641f94ab9229e03 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 21 Nov 2010 15:12:12 -0800 Subject: [PATCH] fix regression in the transform api --- .../compass/stylesheets/compass/css3/_transform-v2.scss | 2 +- lib/compass/sass_extensions/functions/if.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/compass/stylesheets/compass/css3/_transform-v2.scss b/frameworks/compass/stylesheets/compass/css3/_transform-v2.scss index 1e4c34d4..8056562e 100644 --- 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 index 9f599de4..3771db3c 100644 --- 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