Merge pull request #408 from jugnoo/bug/triangle_sass_32_compat

Partially revert 089beb5 that breaks...
thoughtbot · Apr 23, 2014 · cfb3103 · cfb3103
2 parents 4cf74ac + 7842aef
commit cfb3103
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/assets/stylesheets/addons/_triangle.scss b/app/assets/stylesheets/addons/_triangle.scss
@@ -6,7 +6,10 @@
   $height: nth($size, length($size));
 
   $foreground-color: nth($color, 1);
-  $background-color: if(length($color) == 2, nth($color, 2), transparent);
+  $background-color: transparent !default;
+  @if (length($color) == 2) {
+    $background-color: nth($color, 2);
+  }
 
   @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
 

diff --git a/dist/addons/_triangle.scss b/dist/addons/_triangle.scss
@@ -6,7 +6,10 @@
   $height: nth($size, length($size));
 
   $foreground-color: nth($color, 1);
-  $background-color: if(length($color) == 2, nth($color, 2), transparent);
+  $background-color: transparent !default;
+  @if (length($color) == 2) {
+    $background-color: nth($color, 2);
+  }
 
   @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {