Combinaison des deux branches

aaronrussell · Apr 2, 2012 · 6997a10 · 6997a10
1 parent 3ff286b
commit 6997a10
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/lib/stylesheets/_rgbapng.scss b/lib/stylesheets/_rgbapng.scss
@@ -5,20 +5,28 @@
 
 $rgbapng_path: 'rgbapng' !default;
 
-@mixin rgba-background($color, $dir:$rgbapng_path){
+@mixin rgba-background($color, $opacity: 1, $dir: $rgbapng_path)
+{
+  $color: rgba($color, $opacity);
   background: image_url(png_pixelate($color, $dir));
   background: $color;
 }
 
-@mixin rgba-background-inline($color){
+@mixin rgba-background-inline($color, $opacity: 1)
+{
+  $color: rgba($color, $opacity);
   background: png_base64($color);
   background: $color;
 }
 
-@function rgba-png($color, $dir: $rgbapng_path) {
+@function rgba-png($color, $opacity: 1, $dir: $rgbapng_path)
+{
+  $color: rgba($color, $opacity);
   @return image_url(png_pixelate($color, $dir));
 }
 
-@function rgba-inline($color) {
+@function rgba-inline($color, $opacity: 1)
+{
+  $color: rgba($color, $opacity);
   @return png_base64($color);
 }