bourbon 3.1.1 → 3.1.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 46f7567e94d25f6e5cb6d54753f75e2d94582f75
+  data.tar.gz: 679f0216f26877871879bd44cbd9f9ee93abfe34
+SHA512:
+  metadata.gz: bec338b0657ad660a2b2e43745f467230d94add0074aa2c506c65900fe1a0e85b5c09044fd9f7046f5389f92167a59bbfbd5d38a54df63f3df300bef6b3c09b8
+  data.tar.gz: 8e4e3136fedfdf421461636aac46ab72ed62dcc5c0cb14aa168fdf44c78007c1a5b98a972e5cd2bbef2c7f5de64095077e13d54cfb390798d45d497048292359

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bourbon (3.0.0)
+    bourbon (3.1.2)
       sass (>= 3.2.0)
       thor
 
@@ -36,9 +36,9 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sass (3.2.3)
+    sass (3.2.6)
     term-ansicolor (1.0.7)
-    thor (0.16.0)
+    thor (0.17.0)
 
 PLATFORMS
   ruby

data/app/assets/stylesheets/_bourbon-deprecated-upcoming.scss

@@ -3,6 +3,11 @@
 // They will be removed in the next MAJOR version release
 //************************************************************************//
 @mixin box-shadow ($shadows...) {
-    @include prefixer(box-shadow, $shadows, spec);
-    @warn "box-shadow is deprecated and will be removed in the next major version release";
+  @include prefixer(box-shadow, $shadows, spec);
+  @warn "box-shadow is deprecated and will be removed in the next major version release";
+}
+
+@mixin background-size ($lengths...) {
+  @include prefixer(background-size, $lengths, spec);
+  @warn "background-size is deprecated and will be removed in the next major version release";
 }

data/app/assets/stylesheets/_bourbon.scss

@@ -1,22 +1,29 @@
+// Custom Helpers
+@import "helpers/deprecated-webkit-gradient";
+@import "helpers/gradient-positions-parser";
+@import "helpers/linear-positions-parser";
+@import "helpers/radial-arg-parser";
+@import "helpers/radial-positions-parser";
+@import "helpers/render-gradients";
+@import "helpers/shape-size-stripper";
+
 // Custom Functions
 @import "functions/compact";
-@import "functions/deprecated-webkit-gradient";
 @import "functions/flex-grid";
 @import "functions/grid-width";
 @import "functions/linear-gradient";
 @import "functions/modular-scale";
 @import "functions/px-to-em";
 @import "functions/radial-gradient";
-@import "functions/render-gradients";
 @import "functions/tint-shade";
 @import "functions/transition-property-name";
 
 // CSS3 Mixins
 @import "css3/animation";
 @import "css3/appearance";
+@import "css3/backface-visibility";
 @import "css3/background";
 @import "css3/background-image";
-@import "css3/background-size";
 @import "css3/border-image";
 @import "css3/border-radius";
 @import "css3/box-sizing";

data/app/assets/stylesheets/addons/_button.scss

@@ -74,7 +74,7 @@
   padding: 7px 18px;
   text-decoration: none;
   text-shadow: 0 1px 0 $text-shadow;
-  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
 
   &:hover:not(:disabled) {
     $base-color-hover:    adjust-color($base-color, $saturation: -4%, $lightness: -5%);
@@ -219,7 +219,7 @@
   text-align: center;
   text-decoration: none;
   text-shadow: 0 -1px 1px $text-shadow;
-  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
 
   &:hover:not(:disabled) {
     $base-color-hover:    adjust-color($base-color,                                $lightness: -4.5%);
@@ -246,7 +246,7 @@
     cursor: pointer;
     @include linear-gradient ($base-color-hover, $stop-gradient-hover);
     text-shadow: 0 -1px 1px $text-shadow-hover;
-    -webkit-background-clip: padding-box;
+    background-clip: padding-box;
   }
 
   &:active:not(:disabled) {

data/app/assets/stylesheets/addons/_hide-text.scss

@@ -3,11 +3,3 @@
   font:             0/0 a;
   text-shadow:      none;
 }
-
-// A CSS image replacement method that does not require the use of text-indent.
-//
-// Examples
-//
-//   .ir {
-//     @include hide-text;
-//   }

data/app/assets/stylesheets/addons/_prefixer.scss

@@ -9,21 +9,30 @@ $prefix-for-spec:      true !default; // required for keyframe mixin
 
 @mixin prefixer ($property, $value, $prefixes) {
   @each $prefix in $prefixes {
-
-    @if $prefix == webkit and $prefix-for-webkit == true {
-      -webkit-#{$property}: $value;
+    @if $prefix == webkit {
+      @if $prefix-for-webkit {
+        -webkit-#{$property}: $value;
+      }
     }
-    @else if $prefix == moz and $prefix-for-mozilla == true {
-      -moz-#{$property}: $value;
+    @else if $prefix == moz {
+      @if $prefix-for-mozilla {
+        -moz-#{$property}: $value;
+      }
     }
-    @else if $prefix == ms and $prefix-for-microsoft == true {
-      -ms-#{$property}: $value;
+    @else if $prefix == ms {
+      @if $prefix-for-microsoft {
+        -ms-#{$property}: $value;
+      }
     }
-    @else if $prefix == o and $prefix-for-opera == true {
-      -o-#{$property}: $value;
+    @else if $prefix == o {
+      @if $prefix-for-opera {
+        -o-#{$property}: $value;
+      }
     }
-    @else if $prefix == spec and $prefix-for-spec == true {
-      #{$property}: $value;
+    @else if $prefix == spec {
+      @if $prefix-for-spec {
+        #{$property}: $value;
+      }
     }
     @else  {
       @warn "Unrecognized prefix: #{$prefix}";

data/app/assets/stylesheets/css3/_backface-visibility.scss

@@ -0,0 +1,6 @@
+//************************************************************************//
+// Backface-visibility mixin
+//************************************************************************//
+@mixin backface-visibility($visibility) {
+  @include prefixer(backface-visibility, $visibility, webkit spec);
+}

data/app/assets/stylesheets/css3/_background-image.scss

@@ -4,29 +4,34 @@
 //************************************************************************//
 
 @mixin background-image($images...) {
-  background-image: add-prefix($images, webkit);
-  background-image: add-prefix($images, moz);
-  background-image: add-prefix($images, ms);
-  background-image: add-prefix($images, o);
-  background-image: add-prefix($images);
+  background-image: _add-prefix($images, webkit);
+  background-image: _add-prefix($images);
 }
 
-
-@function add-prefix($images, $vendor: false) {
+@function _add-prefix($images, $vendor: false) {
   $images-prefixed: ();
-
+  $gradient-positions: false;
   @for $i from 1 through length($images) {
     $type: type-of(nth($images, $i)); // Get type of variable - List or String
 
     // If variable is a list - Gradient
     @if $type == list {
-      $gradient-type: nth(nth($images, $i), 1); // Get type of gradient (linear || radial)
-      $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue)
-
-      $gradient: render-gradients($gradient-args, $gradient-type, $vendor);
+      $gradient-type: nth(nth($images, $i), 1); // linear or radial
+      $gradient-pos: null;
+      $gradient-args: null;
+
+      @if ($gradient-type == linear) or ($gradient-type == radial) {
+        $gradient-pos:  nth(nth($images, $i), 2); // Get gradient position
+        $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue)
+      }
+      @else {
+        $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue)
+      }
+
+      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
+      $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
       $images-prefixed: append($images-prefixed, $gradient, comma);
     }
-
     // If variable is a string - Image
     @else if $type == string {
       $images-prefixed: join($images-prefixed, nth($images, $i), comma);
@@ -35,7 +40,6 @@
   @return $images-prefixed;
 }
 
-
 //Examples:
   //@include background-image(linear-gradient(top, orange, red));
   //@include background-image(radial-gradient(50% 50%, cover circle, orange, red));

data/app/assets/stylesheets/css3/_background.scss

@@ -22,20 +22,17 @@
     $fallback-color: $fallback;
   }
   @else {
-    $fallback-color: extract-background-color($backgrounds);
+    $fallback-color: _extract-background-color($backgrounds);
   }
 
   @if $fallback-color {
     background-color: $fallback-color;
   }
-  background: background-add-prefix($backgrounds, webkit);
-  background: background-add-prefix($backgrounds, moz);
-  background: background-add-prefix($backgrounds, ms);
-  background: background-add-prefix($backgrounds, o);
-  background: background-add-prefix($backgrounds);
+  background: _background-add-prefix($backgrounds, webkit);
+  background: _background-add-prefix($backgrounds);
 }
 
-@function extract-background-color($backgrounds) {
+@function _extract-background-color($backgrounds) {
   $final-bg-layer: nth($backgrounds, length($backgrounds));
   @if type-of($final-bg-layer) == list {
     @for $i from 1 through length($final-bg-layer) {
@@ -48,51 +45,50 @@
   @return false;
 }
 
-
-@function background-add-prefix($backgrounds, $vendor: false) {
+@function _background-add-prefix($backgrounds, $vendor: false) {
   $backgrounds-prefixed: ();
 
   @for $i from 1 through length($backgrounds) {
     $shorthand: nth($backgrounds, $i); // Get member for current index
-    $type: type-of($shorthand); // Get type of variable - List or String
+    $type: type-of($shorthand); // Get type of variable - List (gradient) or String (image)
 
-    // If shorthand is a list
+    // If shorthand is a list (gradient)
     @if $type == list {
       $first-member: nth($shorthand, 1); // Get first member of shorthand
 
       // Linear Gradient
       @if index(linear radial, nth($first-member, 1)) {
         $gradient-type: nth($first-member, 1); // linear || radial
-
-        // Get actual gradient (red, blue)
-        $gradient-args: false;
-        $shorthand-start: false;
-        // Linear gradient and positioning, repeat, etc. values
-        @if type-of($first-member) == list {
-          $gradient-args: nth($first-member, 2);
+        $gradient-args:      false;
+        $gradient-positions: false;
+        $shorthand-start:    false;
+        @if type-of($first-member) == list { // Linear gradient plus additional shorthand values — lg(red,orange)repeat,...
+          $gradient-positions: nth($first-member, 2);
+          $gradient-args:      nth($first-member, 3);
           $shorthand-start: 2;
         }
-        // Linear gradient only
-        @else {
-          $gradient-args: nth($shorthand, 2); // Get actual gradient (red, blue)
-          $shorthand-start: 3;
+        @else { // Linear gradient only — lg(red,orange),...
+          $gradient-positions: nth($shorthand, 2);
+          $gradient-args:      nth($shorthand, 3); // Get gradient (red, blue)
         }
 
-        $gradient: render-gradients($gradient-args, $gradient-type, $vendor);
-        @for $j from $shorthand-start through length($shorthand) {
-          $gradient: join($gradient, nth($shorthand, $j), space);
+        $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-positions);
+        $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
+
+        // Append any additional shorthand args to gradient
+        @if $shorthand-start {
+          @for $j from $shorthand-start through length($shorthand) {
+            $gradient: join($gradient, nth($shorthand, $j), space);
+          }
         }
         $backgrounds-prefixed: append($backgrounds-prefixed, $gradient, comma);
       }
-
       // Image with additional properties
       @else {
         $backgrounds-prefixed: append($backgrounds-prefixed, $shorthand, comma);
       }
-
     }
-
-    // If shorthand is a simple string, color or image
+    // If shorthand is a simple string (color or image)
     @else if $type == string {
       $backgrounds-prefixed: join($backgrounds-prefixed, $shorthand, comma);
     }
@@ -102,6 +98,6 @@
 
 //Examples:
   //@include background(linear-gradient(top, orange, red));
-  //@include background(radial-gradient(50% 50%, cover circle, orange, red));
+  //@include background(radial-gradient(circle at 40% 40%, orange, red));
   //@include background(url("/images/a.png") no-repeat, linear-gradient(orange, red));
   //@include background(url("image.png") center center, linear-gradient(orange, red), url("image.png"));

data/app/assets/stylesheets/css3/_border-image.scss

@@ -1,11 +1,11 @@
 @mixin border-image($images) {
-  -webkit-border-image: border-add-prefix($images, webkit);
-     -moz-border-image: border-add-prefix($images, moz);
-       -o-border-image: border-add-prefix($images, o);
-          border-image: border-add-prefix($images);
+  -webkit-border-image: _border-add-prefix($images, webkit);
+     -moz-border-image: _border-add-prefix($images, moz);
+       -o-border-image: _border-add-prefix($images, o);
+          border-image: _border-add-prefix($images);
 }
 
-@function border-add-prefix($images, $vendor: false) {
+@function _border-add-prefix($images, $vendor: false) {
   $border-image: ();
   $images-type:  type-of(nth($images, 1));
   $first-var:    nth(nth($images, 1), 1);          // Get type of Gradient (Linear || radial)
@@ -16,16 +16,14 @@
       @for $i from 2 through length($images) {
         $gradient-type: nth($images, 1);           // Get type of gradient (linear || radial)
         $gradient-args: nth($images, $i);          // Get actual gradient (red, blue)
-        $border-image:  render-gradients($gradient-args, $gradient-type, $vendor);
+        $border-image:  _render-gradients($gradient-args, $gradient-type, $vendor);
       }
     }
-
     // If input is a URL
     @else {
       $border-image: $images;
     }
   }
-
   // If input is gradient or url + additional args
   @else if $images-type == list {
     @for $i from 1 through length($images) {
@@ -35,9 +33,8 @@
       @if $type == list {
         $gradient-type: nth(nth($images, $i), 1); // Get type of gradient (linear || radial)
         $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue)
-        $border-image:  render-gradients($gradient-args, $gradient-type, $vendor);
+        $border-image:  _render-gradients($gradient-args, $gradient-type, $vendor);
       }
-
       // If variable is a string - Image or number
       @else if ($type == string) or ($type == number) {
         $border-image: append($border-image, nth($images, $i));

data/app/assets/stylesheets/css3/_keyframes.scss

@@ -2,7 +2,6 @@
 @mixin keyframes($name) {
   $original-prefix-for-webkit:    $prefix-for-webkit;
   $original-prefix-for-mozilla:   $prefix-for-mozilla;
-  $original-prefix-for-microsoft: $prefix-for-microsoft;
   $original-prefix-for-opera:     $prefix-for-opera;
   $original-prefix-for-spec:      $prefix-for-spec;
 
@@ -20,13 +19,6 @@
       @content;
     }
   }
-  @if $original-prefix-for-microsoft {
-    @include disable-prefix-for-all();
-    $prefix-for-microsoft: true;
-    @-ms-keyframes #{$name} {
-      @content;
-    }
-  }
   @if $original-prefix-for-opera {
     @include disable-prefix-for-all();
     $prefix-for-opera: true;
@@ -35,7 +27,6 @@
     }
   }
   @if $original-prefix-for-spec {
-    $prefix-for-spec:     true !default;
     @include disable-prefix-for-all();
     $prefix-for-spec: true;
     @keyframes #{$name} {
@@ -45,7 +36,6 @@
 
   $prefix-for-webkit:    $original-prefix-for-webkit;
   $prefix-for-mozilla:   $original-prefix-for-mozilla;
-  $prefix-for-microsoft: $original-prefix-for-microsoft;
   $prefix-for-opera:     $original-prefix-for-opera;
   $prefix-for-spec:      $original-prefix-for-spec;
 }

data/app/assets/stylesheets/css3/_linear-gradient.scss

@@ -8,12 +8,20 @@
                        $fallback: false) {
   // Detect what type of value exists in $pos
   $pos-type: type-of(nth($pos, 1));
+  $pos-spec: null;
+  $pos-degree: null;
 
   // If $pos is missing from mixin, reassign vars and add default position
   @if ($pos-type == color) or (nth($pos, 1) == "transparent")  {
     $G10: $G9; $G9: $G8; $G8: $G7; $G7: $G6; $G6: $G5;
      $G5: $G4; $G4: $G3; $G3: $G2; $G2: $G1; $G1: $pos;
-    $pos: top; // Default position
+     $pos: null;
+  }
+
+  @if $pos {
+    $positions: _linear-positions-parser($pos);
+    $pos-degree: nth($positions, 1);
+    $pos-spec:   nth($positions, 2);
   }
 
   $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
@@ -27,17 +35,7 @@
   }
 
   background-color: $fallback-color;
-  background-image: deprecated-webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $full); // Safari <= 5.0
-  background-image:  -webkit-linear-gradient($pos, $full); // Safari 5.1+, Chrome
-  background-image:     -moz-linear-gradient($pos, $full);
-  background-image:      -ms-linear-gradient($pos, $full);
-  background-image:       -o-linear-gradient($pos, $full);
-  background-image: unquote("linear-gradient(#{$pos}, #{$full})");
+  background-image: _deprecated-webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $full); // Safari <= 5.0
+  background-image: -webkit-linear-gradient($pos-degree $full); // Safari 5.1+, Chrome
+  background-image: unquote("linear-gradient(#{$pos-spec}#{$full})");
 }
-
-
-// Usage: Gradient position is optional, default is top. Position can be a degree. Color stops are optional as well.
-// @include linear-gradient(#1e5799, #2989d8);
-// @include linear-gradient(#1e5799, #2989d8, $fallback:#2989d8);
-// @include linear-gradient(top, #1e5799 0%, #2989d8 50%);
-// @include linear-gradient(50deg, rgba(10, 10, 10, 0.5) 0%, #2989d8 50%, #207cca 51%, #7db9e8 100%);

data/app/assets/stylesheets/css3/_perspective.scss

@@ -1,8 +1,8 @@
 @mixin perspective($depth: none) {
   // none | <length>
-  @include prefixer(perspective, $depth, webkit moz o spec);
+  @include prefixer(perspective, $depth, webkit moz spec);
 }
 
 @mixin perspective-origin($value: 50% 50%) {
-  @include prefixer(perspective-origin, $value, webkit moz o spec);
+  @include prefixer(perspective-origin, $value, webkit moz spec);
 }

data/app/assets/stylesheets/css3/_placeholder.scss

@@ -9,6 +9,17 @@ $placeholders: '-webkit-input-placeholder',
         @content;
       }
     }
+    @else if $placeholder == "-moz-placeholder" {
+      // FF 18-
+      &:#{$placeholder} {
+        @content;
+      }
+
+      // FF 19+
+      &::#{$placeholder} {
+        @content;
+      }
+    }
     @else {
       &:#{$placeholder} {
         @content;

data/app/assets/stylesheets/css3/_radial-gradient.scss

@@ -4,58 +4,25 @@
                        $G5: false, $G6: false,
                        $G7: false, $G8: false,
                        $G9: false, $G10: false,
-                       $pos: 50% 50%,
-                       $shape-size: ellipse cover,
+                       $pos: null,
+                       $shape-size: null,
                        $deprecated-pos1: center center,
                        $deprecated-pos2: center center,
                        $deprecated-radius1: 0,
                        $deprecated-radius2: 460,
                        $fallback: false) {
 
-  @each $value in $G1, $G2 {
-    $first-val: nth($value, 1);
-    $pos-type:  type-of($first-val);
-
-    @if ($pos-type != color) or ($first-val != "transparent") {
-      @if ($pos-type == number)
-      or ($first-val == "center")
-      or ($first-val == "top")
-      or ($first-val == "right")
-      or ($first-val == "bottom")
-      or ($first-val == "left") {
-
-        $pos: $value;
-
-        @if $pos == $G1 {
-          $G1: false;
-        }
-      }
-
-      @else if
-         ($first-val == "ellipse")
-      or ($first-val == "circle")
-      or ($first-val == "closest-side")
-      or ($first-val == "closest-corner")
-      or ($first-val == "farthest-side")
-      or ($first-val == "farthest-corner")
-      or ($first-val == "contain")
-      or ($first-val == "cover") {
-
-        $shape-size: $value;
-
-        @if $value == $G1 {
-          $G1: false;
-        }
-
-        @else if $value == $G2 {
-          $G2: false;
-        }
-      }
-    }
-  }
+  $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
+  $G1:  nth($data, 1);
+  $G2:  nth($data, 2);
+  $pos: nth($data, 3);
+  $shape-size: nth($data, 4);
 
   $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
 
+  // Strip deprecated cover/contain for spec
+  $shape-size-spec: _shape-size-stripper($shape-size);
+
   // Set $G1 as the default fallback color
   $first-color: nth($full, 1);
   $fallback-color: nth($first-color, 1);
@@ -64,15 +31,14 @@
     $fallback-color: $fallback;
   }
 
+  // Add Commas and spaces
+  $shape-size: if($shape-size, '#{$shape-size}, ', null);
+  $pos:        if($pos, '#{$pos}, ', null);
+  $pos-spec:   if($pos, 'at #{$pos}', null);
+  $shape-size-spec: if(($shape-size-spec != ' ') and ($pos == null), '#{$shape-size-spec}, ', '#{$shape-size-spec} ');
+
   background-color:  $fallback-color;
-  background-image: deprecated-webkit-gradient(radial, $deprecated-pos1, $deprecated-pos2, $full, $deprecated-radius1, $deprecated-radius2); // Safari <= 5.0
-  background-image:  -webkit-radial-gradient($pos, $shape-size, $full);
-  background-image:     -moz-radial-gradient($pos, $shape-size, $full);
-  background-image:      -ms-radial-gradient($pos, $shape-size, $full);
-  background-image:       -o-radial-gradient($pos, $shape-size, $full);
-  background-image: unquote("radial-gradient(#{$pos}, #{$shape-size}, #{$full})");
+  background-image: _deprecated-webkit-gradient(radial, $deprecated-pos1, $deprecated-pos2, $full, $deprecated-radius1, $deprecated-radius2); // Safari <= 5.0 && IOS 4
+  background-image: -webkit-radial-gradient(unquote(#{$pos}#{$shape-size}#{$full}));
+  background-image: unquote("radial-gradient(#{$shape-size-spec}#{$pos-spec}#{$full})");
 }
-
-//  Usage: Gradient position and shape-size are required. Color stops are optional.
-//  @include radial-gradient(50% 50%, circle cover, #1e5799, #efefef);
-//  @include radial-gradient(50% 50%, circle cover, #eee 10%, #1e5799 30%, #efefef);

data/app/assets/stylesheets/css3/_transition.scss

@@ -5,32 +5,30 @@
 
 @mixin transition ($properties...) {
   @if length($properties) >= 1 {
-    @include prefixer(transition, $properties, webkit moz ms o spec);
+    @include prefixer(transition, $properties, webkit moz spec);
   }
 
   @else {
     $properties: all 0.15s ease-out 0;
-    @include prefixer(transition, $properties, webkit moz ms o spec);
+    @include prefixer(transition, $properties, webkit moz spec);
   }
 }
 
 @mixin transition-property ($properties...) {
    -webkit-transition-property: transition-property-names($properties, 'webkit');
       -moz-transition-property: transition-property-names($properties, 'moz');
-       -ms-transition-property: transition-property-names($properties, 'ms');
-        -o-transition-property: transition-property-names($properties, 'o');
            transition-property: transition-property-names($properties, false);
 }
 
 @mixin transition-duration ($times...) {
-  @include prefixer(transition-duration, $times, webkit moz ms o spec);
+  @include prefixer(transition-duration, $times, webkit moz spec);
 }
 
 @mixin transition-timing-function ($motions...) {
 // ease | linear | ease-in | ease-out | ease-in-out | cubic-bezier()
-  @include prefixer(transition-timing-function, $motions, webkit moz ms o spec);
+  @include prefixer(transition-timing-function, $motions, webkit moz spec);
 }
 
 @mixin transition-delay ($times...) {
-  @include prefixer(transition-delay, $times, webkit moz ms o spec);
+  @include prefixer(transition-delay, $times, webkit moz spec);
 }

data/app/assets/stylesheets/functions/_linear-gradient.scss

@@ -1,6 +1,13 @@
-@function linear-gradient($gradients...) {
+@function linear-gradient($pos, $gradients...) {
   $type: linear;
-  $type-gradient: append($type, $gradients, comma);
+  $pos-type: type-of(nth($pos, 1));
 
+  // if $pos doesn't exist, fix $gradient
+  @if ($pos-type == color) or (nth($pos, 1) == "transparent")  {
+    $gradients: zip($pos $gradients);
+    $pos: false;
+  }
+
+  $type-gradient: $type, $pos, $gradients;
   @return $type-gradient;
 }

data/app/assets/stylesheets/functions/_radial-gradient.scss

@@ -4,54 +4,20 @@
                        $G5: false, $G6: false,
                        $G7: false, $G8: false,
                        $G9: false, $G10: false,
-                       $pos: 50% 50%,
-                       $shape-size: ellipse cover) {
+                       $pos: null,
+                       $shape-size: null) {
 
-  @each $value in $G1, $G2 {
-    $first-val: nth($value, 1);
-    $pos-type:  type-of($first-val);
-
-    @if ($pos-type != color) or ($first-val != "transparent") {
-      @if ($pos-type == number)
-      or ($first-val == "center")
-      or ($first-val == "top")
-      or ($first-val == "right")
-      or ($first-val == "bottom")
-      or ($first-val == "left") {
-
-        $pos: $value;
-
-        @if $pos == $G1 {
-          $G1: false;
-        }
-      }
-
-      @else if
-         ($first-val == "ellipse")
-      or ($first-val == "circle")
-      or ($first-val == "closest-side")
-      or ($first-val == "closest-corner")
-      or ($first-val == "farthest-side")
-      or ($first-val == "farthest-corner")
-      or ($first-val == "contain")
-      or ($first-val == "cover") {
-
-        $shape-size: $value;
-
-        @if $value == $G1 {
-          $G1: false;
-        }
-
-        @else if $value == $G2 {
-          $G2: false;
-        }
-      }
-    }
-  }
+  $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
+  $G1:  nth($data, 1);
+  $G2:  nth($data, 2);
+  $pos: nth($data, 3);
+  $shape-size: nth($data, 4);
 
   $type: radial;
-  $gradient: compact($pos, $shape-size, $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
-  $type-gradient: append($type, $gradient, comma);
+  $gradient: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
 
+  $type-gradient: $type, $shape-size $pos, $gradient;
   @return $type-gradient;
 }
+
+

data/app/assets/stylesheets/{functions → helpers}/_deprecated-webkit-gradient.scss

@@ -1,6 +1,6 @@
 // Render Deprecated Webkit Gradient - Linear || Radial
 //************************************************************************//
-@function deprecated-webkit-gradient($type,
+@function _deprecated-webkit-gradient($type,
                                      $deprecated-pos1, $deprecated-pos2,
                                      $full,
                                      $deprecated-radius1: false, $deprecated-radius2: false) {
@@ -17,16 +17,13 @@
       $color-stop: color-stop(nth($gradient, 2), nth($gradient, 1));
       $gradient-list: join($gradient-list, $color-stop, comma);
     }
-
     @else if $gradient != null {
       @if $i == $full-length {
         $percentage: 100%;
       }
-
       @else {
         $percentage: ($i - 1) * (100 / ($full-length - 1)) + "%";
       }
-
       $color-stop: color-stop(unquote($percentage), $gradient);
       $gradient-list: join($gradient-list, $color-stop, comma);
     }
@@ -35,10 +32,8 @@
   @if $type == radial {
     $gradient: -webkit-gradient(radial, $deprecated-pos1, $deprecated-radius1, $deprecated-pos2, $deprecated-radius2, $gradient-list);
   }
-
   @else if $type == linear {
     $gradient: -webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $gradient-list);
   }
-
   @return $gradient;
 }

data/app/assets/stylesheets/helpers/_gradient-positions-parser.scss

@@ -0,0 +1,13 @@
+@function _gradient-positions-parser($gradient-type, $gradient-positions) {
+  @if $gradient-positions
+  and ($gradient-type == linear)
+  and (type-of($gradient-positions) != color) {
+    $gradient-positions: _linear-positions-parser($gradient-positions);
+  }
+  @else if $gradient-positions
+  and ($gradient-type == radial)
+  and (type-of($gradient-positions) != color) {
+    $gradient-positions: _radial-positions-parser($gradient-positions);
+  }
+  @return $gradient-positions;
+}

data/app/assets/stylesheets/helpers/_linear-positions-parser.scss

@@ -0,0 +1,60 @@
+@function _linear-positions-parser($pos) {
+  $type: type-of(nth($pos, 1));
+  $spec: null;
+  $degree: null;
+  $side: null;
+  $corner: null;
+  $length: length($pos);
+  // Parse Side and corner positions
+  @if ($length > 1) {
+    @if nth($pos, 1) == "to" {
+      $side: nth($pos, 2);
+
+      @if $length == 2 {
+        // Swap for backwards compatability
+        $degree: _position-flipper(nth($pos, 2));
+      }
+      @else if $length == 3 {
+        $corner: nth($pos, 3);
+      }
+      @if ("#{$side} #{$corner}" == "left top") or ("#{$side} #{$corner}" == "top left") {
+        $degree: 135deg;
+      }
+      @else if ("#{$side} #{$corner}" == "right top") or ("#{$side} #{$corner}" == "top right") {
+        $degree: 45deg;
+      }
+      @else if ("#{$side} #{$corner}" == "right bottom") or ("#{$side} #{$corner}" == "bottom right") {
+        $degree: -45deg;
+      }
+      @else if ("#{$side} #{$corner}" == "left bottom") or ("#{$side} #{$corner}" == "bottom left") {
+        $degree: -135deg;
+      }
+    }
+    @else {
+      @warn "Incorrect gradient syntax";
+    }
+    $spec: to $side $corner;
+  }
+  @else if $length == 1 {
+    // Swap for backwards compatability
+    @if $type == string {
+      $degree: $pos;
+      $spec: to _position-flipper($pos);
+    }
+    @else {
+      $degree: -270 - $pos; //rotate the gradient opposite from spec
+      $spec: $pos;
+    }
+  }
+  $degree: unquote($degree + ",");
+  $spec:   unquote($spec + ",");
+  @return $degree $spec;
+}
+
+// Helper Function
+@function _position-flipper($pos) {
+ @return if($pos == left, right, null)
+         if($pos == right, left, null)
+         if($pos == top, bottom, null)
+         if($pos == bottom, top, null);
+}

data/app/assets/stylesheets/helpers/_radial-arg-parser.scss

@@ -0,0 +1,69 @@
+@function _radial-arg-parser($G1, $G2, $pos, $shape-size) {
+  @each $value in $G1, $G2 {
+    $first-val: nth($value, 1);
+    $pos-type:  type-of($first-val);
+    $spec-at-index: null;
+
+    // Determine if spec was passed to mixin
+    @if type-of($value) == list {
+      $spec-at-index: if(index($value, at), index($value, at), false);
+    }
+    @if $spec-at-index {
+      @if $spec-at-index > 1 {
+        @for $i from 1 through ($spec-at-index - 1) {
+          $shape-size: $shape-size nth($value, $i);
+        }
+        @for $i from ($spec-at-index + 1) through length($value) {
+          $pos: $pos nth($value, $i);
+        }
+      }
+      @else if $spec-at-index == 1 {
+        @for $i from ($spec-at-index + 1) through length($value) {
+          $pos: $pos nth($value, $i);
+        }
+      }
+      $G1: false;
+    }
+
+    // If not spec calculate correct values
+    @else {
+      @if ($pos-type != color) or ($first-val != "transparent") {
+        @if ($pos-type == number)
+        or ($first-val == "center")
+        or ($first-val == "top")
+        or ($first-val == "right")
+        or ($first-val == "bottom")
+        or ($first-val == "left") {
+
+          $pos: $value;
+
+          @if $pos == $G1 {
+            $G1: false;
+          }
+        }
+
+        @else if
+           ($first-val == "ellipse")
+        or ($first-val == "circle")
+        or ($first-val == "closest-side")
+        or ($first-val == "closest-corner")
+        or ($first-val == "farthest-side")
+        or ($first-val == "farthest-corner")
+        or ($first-val == "contain")
+        or ($first-val == "cover") {
+
+          $shape-size: $value;
+
+          @if $value == $G1 {
+            $G1: false;
+          }
+
+          @else if $value == $G2 {
+            $G2: false;
+          }
+        }
+      }
+    }
+  }
+  @return $G1, $G2, $pos, $shape-size;
+}

data/app/assets/stylesheets/helpers/_radial-positions-parser.scss

@@ -0,0 +1,18 @@
+@function _radial-positions-parser($gradient-pos) {
+  $shape-size: nth($gradient-pos, 1);
+  $pos:        nth($gradient-pos, 2);
+  $shape-size-spec: _shape-size-stripper($shape-size);
+
+  $pre-spec: unquote(if($pos, "#{$pos}, ", null))
+             unquote(if($shape-size, "#{$shape-size},", null));
+  $pos-spec: if($pos, "at #{$pos}", null);
+
+  $spec: "#{$shape-size-spec} #{$pos-spec}";
+
+  // Add comma
+  @if ($spec != '  ') {
+    $spec: "#{$spec},"
+  }
+
+  @return $pre-spec $spec;
+}

data/app/assets/stylesheets/helpers/_render-gradients.scss

@@ -0,0 +1,26 @@
+// User for linear and radial gradients within background-image or border-image properties
+
+@function _render-gradients($gradient-positions, $gradients, $gradient-type, $vendor: false) {
+  $pre-spec: null;
+  $spec: null;
+  $vendor-gradients: null;
+  @if $gradient-type == linear {
+    @if $gradient-positions {
+      $pre-spec: nth($gradient-positions, 1);
+      $spec:     nth($gradient-positions, 2);
+    }
+  }
+  @else if $gradient-type == radial {
+    $pre-spec: nth($gradient-positions, 1);
+    $spec:     nth($gradient-positions, 2);
+  }
+
+  @if $vendor {
+    $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient(#{$pre-spec} $gradients);
+  }
+  @else if $vendor == false {
+    $vendor-gradients: "#{$gradient-type}-gradient(#{$spec} #{$gradients})";
+    $vendor-gradients: unquote($vendor-gradients);
+  }
+  @return $vendor-gradients;
+}

data/app/assets/stylesheets/helpers/_shape-size-stripper.scss

@@ -0,0 +1,10 @@
+@function _shape-size-stripper($shape-size) {
+  $shape-size-spec: null;
+  @each $value in $shape-size {
+    @if ($value == "cover") or ($value == "contain") {
+      $value: null;
+    }
+    $shape-size-spec: "#{$shape-size-spec} #{$value}";
+  }
+  @return $shape-size-spec;
+}

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "3.1.1"
+  VERSION = "3.1.2.1"
 end

data/readme.md

@@ -1,4 +1,4 @@
-[![Bourbon Sass Mixin Library](http://bourbon.io/images/bourbon-logo.png)](http://bourbon.io)
+[![Bourbon Sass Mixin Library](http://bourbon.io/images/shared/bourbon-logo.png)](http://bourbon.io)
 
 # A simple and lightweight mixin library for Sass
 Bourbon is a comprehensive library of sass mixins that are designed to be simple

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 3.1.1
-  prerelease: 
+  version: 3.1.2.1
 platform: ruby
 authors:
 - Phil LaPier
@@ -20,12 +19,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,7 +31,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,7 +38,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,7 +45,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -57,7 +52,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -65,7 +59,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -73,7 +66,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -81,7 +73,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -127,8 +118,8 @@ files:
 - app/assets/stylesheets/addons/_triangle.scss
 - app/assets/stylesheets/css3/_animation.scss
 - app/assets/stylesheets/css3/_appearance.scss
+- app/assets/stylesheets/css3/_backface-visibility.scss
 - app/assets/stylesheets/css3/_background-image.scss
-- app/assets/stylesheets/css3/_background-size.scss
 - app/assets/stylesheets/css3/_background.scss
 - app/assets/stylesheets/css3/_border-image.scss
 - app/assets/stylesheets/css3/_border-radius.scss
@@ -148,16 +139,21 @@ files:
 - app/assets/stylesheets/css3/_transition.scss
 - app/assets/stylesheets/css3/_user-select.scss
 - app/assets/stylesheets/functions/_compact.scss
-- app/assets/stylesheets/functions/_deprecated-webkit-gradient.scss
 - app/assets/stylesheets/functions/_flex-grid.scss
 - app/assets/stylesheets/functions/_grid-width.scss
 - app/assets/stylesheets/functions/_linear-gradient.scss
 - app/assets/stylesheets/functions/_modular-scale.scss
 - app/assets/stylesheets/functions/_px-to-em.scss
 - app/assets/stylesheets/functions/_radial-gradient.scss
-- app/assets/stylesheets/functions/_render-gradients.scss
 - app/assets/stylesheets/functions/_tint-shade.scss
 - app/assets/stylesheets/functions/_transition-property-name.scss
+- app/assets/stylesheets/helpers/_deprecated-webkit-gradient.scss
+- app/assets/stylesheets/helpers/_gradient-positions-parser.scss
+- app/assets/stylesheets/helpers/_linear-positions-parser.scss
+- app/assets/stylesheets/helpers/_radial-arg-parser.scss
+- app/assets/stylesheets/helpers/_radial-positions-parser.scss
+- app/assets/stylesheets/helpers/_render-gradients.scss
+- app/assets/stylesheets/helpers/_shape-size-stripper.scss
 - bin/bourbon
 - bourbon.gemspec
 - features/install.feature
@@ -174,27 +170,26 @@ files:
 - readme.md
 homepage: https://github.com/thoughtbot/bourbon
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: bourbon
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Bourbon Sass Mixins using SCSS syntax.
 test_files:
 - features/install.feature

data/app/assets/stylesheets/css3/_background-size.scss

@@ -1,3 +0,0 @@
-@mixin background-size ($lengths...) {
-  @include prefixer(background-size, $lengths, webkit moz ms o spec);
-}

data/app/assets/stylesheets/functions/_render-gradients.scss

@@ -1,14 +0,0 @@
-// User for linear and radial gradients within background-image or border-image properties
-
-@function render-gradients($gradients, $gradient-type, $vendor: false) {
-  $vendor-gradients: false;
-  @if $vendor {
-    $vendor-gradients: -#{$vendor}-#{$gradient-type}-gradient($gradients);
-  }
-
-  @else if $vendor == false {
-    $vendor-gradients: "#{$gradient-type}-gradient(#{$gradients})";
-    $vendor-gradients: unquote($vendor-gradients);
-  }
-  @return $vendor-gradients;
-}