bourbon 2.1.3 → 3.0.0

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    bourbon (2.1.2)
-      sass (>= 3.2)
+    bourbon (3.0.0)
+      sass (>= 3.2.0)
       thor
 
 GEM
@@ -36,7 +36,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sass (3.2.2)
+    sass (3.2.3)
     term-ansicolor (1.0.7)
     thor (0.16.0)
 

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

@@ -0,0 +1,3 @@
+//************************************************************************//
+// These mixins/functions will be deprecated in the next MAJOR version release
+//************************************************************************//

data/app/assets/stylesheets/_bourbon.scss

@@ -1,4 +1,5 @@
 // Custom Functions
+@import "functions/compact";
 @import "functions/deprecated-webkit-gradient";
 @import "functions/flex-grid";
 @import "functions/grid-width";
@@ -26,6 +27,7 @@
 @import "css3/image-rendering";
 @import "css3/inline-block";
 @import "css3/linear-gradient";
+@import "css3/perspective";
 @import "css3/radial-gradient";
 @import "css3/transform";
 @import "css3/transition";
@@ -40,3 +42,6 @@
 @import "addons/position";
 @import "addons/prefixer";
 @import "addons/timing-functions";
+
+// Soon to be deprecated Mixins
+@import "bourbon-deprecated-upcoming";

data/app/assets/stylesheets/addons/_html5-input-types.scss

@@ -21,15 +21,35 @@ $inputs-list: 'input[type="email"]',
               'input[type="week"]';
 
 $unquoted-inputs-list: ();
-
 @each $input-type in $inputs-list {
   $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma);
 }
 
 $all-text-inputs: $unquoted-inputs-list;
 
+
+// Hover Pseudo-class
+//************************************************************************//
+$all-text-inputs-hover: ();
+@each $input-type in $unquoted-inputs-list {
+      $input-type-hover: $input-type + ":hover";
+      $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma);
+}
+
+// Focus Pseudo-class
+//************************************************************************//
+$all-text-inputs-focus: ();
+@each $input-type in $unquoted-inputs-list {
+      $input-type-focus: $input-type + ":focus";
+      $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma);
+}
+
 // You must use interpolation on the variable:
 // #{$all-text-inputs}
+// #{$all-text-inputs-hover}
+// #{$all-text-inputs-focus}
+
+// Example
 //************************************************************************//
 //   #{$all-text-inputs}, textarea {
 //     border: 1px solid red;

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

@@ -1,16 +1,27 @@
 //************************************************************************//
-// Default: Webkit, moz, spec
-// Example: @include prefixer(border-radius, $radii, $o: true);
+// Example: @include prefixer(border-radius, $radii, webkit ms spec);
 //************************************************************************//
-@mixin prefixer ($property, $value,
-                 $webkit: true,
-                    $moz: true,
-                     $ms: false,
-                      $o: false,
-                   $spec: true) {
-  @if $webkit { -webkit-#{$property}: $value; }
-  @if $moz    {    -moz-#{$property}: $value; }
-  @if $ms     {     -ms-#{$property}: $value; }
-  @if $o      {      -o-#{$property}: $value; }
-  @if $spec   {         #{$property}: $value; }
+@mixin prefixer ($property, $value, $prefixes) {
+
+  @each $prefix in $prefixes {
+
+    @if $prefix == webkit {
+      -webkit-#{$property}: $value;
+    }
+    @else if $prefix == moz {
+      -moz-#{$property}: $value;
+    }
+    @else if $prefix == ms {
+      -ms-#{$property}: $value;
+    }
+    @else if $prefix == o {
+      -o-#{$property}: $value;
+    }
+    @else if $prefix == spec {
+      #{$property}: $value;
+    }
+    @else  {
+      @warn "Unrecognized prefix: #{$prefix}";
+    }
+  }
 }

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

@@ -2,124 +2,51 @@
 // Each of these mixins support comma separated lists of values, which allows different transitions for individual properties to be described in a single style rule. Each value in the list corresponds to the value at that same position in the other properties.
 
 // Official animation shorthand property.
-@mixin animation ($animation-1,
-  $animation-2: false, $animation-3: false,
-  $animation-4: false, $animation-5: false,
-  $animation-6: false, $animation-7: false,
-  $animation-8: false, $animation-9: false)
-  {
-    $full: compact($animation-1, $animation-2, $animation-3, $animation-4,
-                   $animation-5, $animation-6, $animation-7, $animation-8, $animation-9);
-
-  @include prefixer(animation, $full);
+@mixin animation ($animations...) {
+  @include prefixer(animation, $animations, webkit moz spec);
 }
 
 // Individual Animation Properties
-@mixin animation-name ($name-1,
-  $name-2: false, $name-3: false,
-  $name-4: false, $name-5: false,
-  $name-6: false, $name-7: false,
-  $name-8: false, $name-9: false)
-  {
-    $full:  compact($name-1, $name-2, $name-3, $name-4,
-                    $name-5, $name-6, $name-7, $name-8, $name-9);
-
-  @include prefixer(animation-name, $full);
+@mixin animation-name ($names...) {
+  @include prefixer(animation-name, $names, webkit moz spec);
 }
 
 
-@mixin animation-duration ($time-1: 0,
-  $time-2: false, $time-3: false,
-  $time-4: false, $time-5: false,
-  $time-6: false, $time-7: false,
-  $time-8: false, $time-9: false)
-  {
-    $full:  compact($time-1, $time-2, $time-3, $time-4,
-                    $time-5, $time-6, $time-7, $time-8, $time-9);
-
-  @include prefixer(animation-duration, $full);
+@mixin animation-duration ($times...) {
+  @include prefixer(animation-duration, $times, webkit moz spec);
 }
 
 
-@mixin animation-timing-function ($motion-1: ease,
-//  ease | linear | ease-in | ease-out | ease-in-out
-  $motion-2: false, $motion-3: false,
-  $motion-4: false, $motion-5: false,
-  $motion-6: false, $motion-7: false,
-  $motion-8: false, $motion-9: false)
-  {
-    $full:  compact($motion-1, $motion-2, $motion-3, $motion-4,
-                    $motion-5, $motion-6, $motion-7, $motion-8, $motion-9);
-
-  @include prefixer(animation-timing-function, $full);
+@mixin animation-timing-function ($motions...) {
+// ease | linear | ease-in | ease-out | ease-in-out
+  @include prefixer(animation-timing-function, $motions, webkit moz spec);
 }
 
 
-@mixin animation-iteration-count ($value-1: 1,
-//  infinite | <number>
-  $value-2: false, $value-3: false,
-  $value-4: false, $value-5: false,
-  $value-6: false, $value-7: false,
-  $value-8: false, $value-9: false)
-  {
-    $full:  compact($value-1, $value-2, $value-3, $value-4,
-                    $value-5, $value-6, $value-7, $value-8, $value-9);
-
-  @include prefixer(animation-iteration-count, $full);
+@mixin animation-iteration-count ($values...) {
+// infinite | <number>
+  @include prefixer(animation-iteration-count, $values, webkit moz spec);
 }
 
 
-@mixin animation-direction ($direction-1: normal,
-//  normal | alternate
-  $direction-2: false, $direction-3: false,
-  $direction-4: false, $direction-5: false,
-  $direction-6: false, $direction-7: false,
-  $direction-8: false, $direction-9: false)
-  {
-    $full:  compact($direction-1, $direction-2, $direction-3, $direction-4,
-                    $direction-5, $direction-6, $direction-7, $direction-8, $direction-9);
-
-  @include prefixer(animation-direction, $full);
+@mixin animation-direction ($directions...) {
+// normal | alternate
+  @include prefixer(animation-direction, $directions, webkit moz spec);
 }
 
 
-@mixin animation-play-state ($state-1: running,
-//  running | paused
-  $state-2: false, $state-3: false,
-  $state-4: false, $state-5: false,
-  $state-6: false, $state-7: false,
-  $state-8: false, $state-9: false)
-  {
-    $full:  compact($state-1, $state-2, $state-3, $state-4,
-                    $state-5, $state-6, $state-7, $state-8, $state-9);
-
-  @include prefixer(animation-play-state, $full);
+@mixin animation-play-state ($states...) {
+// running | paused
+  @include prefixer(animation-play-state, $states, webkit moz spec);
 }
 
 
-@mixin animation-delay ($time-1: 0,
-  $time-2: false, $time-3: false,
-  $time-4: false, $time-5: false,
-  $time-6: false, $time-7: false,
-  $time-8: false, $time-9: false)
-  {
-    $full:  compact($time-1, $time-2, $time-3, $time-4,
-                    $time-5, $time-6, $time-7, $time-8, $time-9);
-
-  @include prefixer(animation-delay, $full);
+@mixin animation-delay ($times...) {
+  @include prefixer(animation-delay, $times, webkit moz spec);
 }
 
 
-@mixin animation-fill-mode ($mode-1: none,
-//  http://goo.gl/l6ckm
-//  none | forwards | backwards | both
-  $mode-2: false, $mode-3: false,
-  $mode-4: false, $mode-5: false,
-  $mode-6: false, $mode-7: false,
-  $mode-8: false, $mode-9: false)
-  {
-    $full:  compact($mode-1, $mode-2, $mode-3, $mode-4,
-                    $mode-5, $mode-6, $mode-7, $mode-8, $mode-9);
-
-  @include prefixer(animation-fill-mode, $full);
+@mixin animation-fill-mode ($modes...) {
+// none | forwards | backwards | both
+  @include prefixer(animation-fill-mode, $modes, webkit moz spec);
 }

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

@@ -1,3 +1,3 @@
 @mixin appearance ($value) {
-  @include prefixer(appearance, $value, webkit, moz, ms, o);
+  @include prefixer(appearance, $value, webkit moz ms o spec);
 }

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

@@ -3,19 +3,7 @@
 // gradients, or for stringing multiple gradients together.
 //************************************************************************//
 
-@mixin background-image(
-  $image-1       , $image-2: false,
-  $image-3: false, $image-4: false,
-  $image-5: false, $image-6: false,
-  $image-7: false, $image-8: false,
-  $image-9: false, $image-10: false
-) {
-  $images: compact($image-1, $image-2,
-           $image-3, $image-4,
-           $image-5, $image-6,
-           $image-7, $image-8,
-           $image-9, $image-10);
-
+@mixin background-image($images...) {
   background-image: add-prefix($images, webkit);
   background-image: add-prefix($images, moz);
   background-image: add-prefix($images, ms);
@@ -48,10 +36,9 @@
 }
 
 
-
 //Examples:
   //@include background-image(linear-gradient(top, orange, red));
   //@include background-image(radial-gradient(50% 50%, cover circle, orange, red));
   //@include background-image(url("/images/a.png"), linear-gradient(orange, red));
   //@include background-image(url("image.png"), linear-gradient(orange, red), url("image.png"));
-  //@include background-image(linear-gradient(hsla(0, 100%, 100%, 0.25) 0%, hsla(0, 100%, 100%, 0.08) 50%, transparent 50%), linear-gradient(orange, red);
+  //@include background-image(linear-gradient(hsla(0, 100%, 100%, 0.25) 0%, hsla(0, 100%, 100%, 0.08) 50%, transparent 50%), linear-gradient(orange, red));

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

@@ -1,11 +1,3 @@
-@mixin background-size ($length-1,
-  $length-2: false, $length-3: false,
-  $length-4: false, $length-5: false,
-  $length-6: false, $length-7: false,
-  $length-8: false, $length-9: false)
-  {
-    $full: compact($length-1, $length-2, $length-3, $length-4,
-                   $length-5, $length-6, $length-7, $length-8, $length-9);
-
-@include prefixer(background-size, $full, webkit, moz, ms, o);
+@mixin background-size ($lengths...) {
+  @include prefixer(background-size, $lengths, webkit moz ms o spec);
 }

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

@@ -1,44 +1,22 @@
-@mixin border-radius ($radii) {
-  @include prefixer(border-radius, $radii, webkit, not moz);
-  @warn "border-radius mixin is deprecated and will be removed in the next major version release.";
-}
-
-@mixin border-top-left-radius($radii) {
-  @include prefixer(border-top-left-radius, $radii, webkit, not moz);
-  @warn "border-top-left-radius mixin is deprecated and will be removed in the next major version release.";
-}
-
-@mixin border-top-right-radius($radii) {
-  @include prefixer(border-top-right-radius, $radii, webkit, not moz);
-  @warn "border-top-right-radius mixin is deprecated and will be removed in the next major version release.";
-}
-
-@mixin border-bottom-left-radius($radii) {
-  @include prefixer(border-bottom-left-radius, $radii, webkit, not moz);
-  @warn "border-bottom-left-radius mixin is deprecated and will be removed in the next major version release.";
-}
-
-@mixin border-bottom-right-radius($radii) {
-  @include prefixer(border-bottom-right-radius, $radii, webkit, not moz);
-  @warn "border-bottom-right-radius mixin is deprecated and will be removed in the next major version release.";
-}
-
+//************************************************************************//
+// Shorthand Border-radius mixins
+//************************************************************************//
 @mixin border-top-radius($radii) {
-  @include border-top-left-radius($radii);
-  @include border-top-right-radius($radii);
-}
-
-@mixin border-right-radius($radii) {
-  @include border-top-right-radius($radii);
-  @include border-bottom-right-radius($radii);
+  @include prefixer(border-top-left-radius, $radii, spec);
+  @include prefixer(border-top-right-radius, $radii, spec);
 }
 
 @mixin border-bottom-radius($radii) {
-  @include border-bottom-left-radius($radii);
-  @include border-bottom-right-radius($radii);
+  @include prefixer(border-bottom-left-radius, $radii, spec);
+  @include prefixer(border-bottom-right-radius, $radii, spec);
 }
 
 @mixin border-left-radius($radii) {
-  @include border-top-left-radius($radii);
-  @include border-bottom-left-radius($radii);
+  @include prefixer(border-top-left-radius, $radii, spec);
+  @include prefixer(border-bottom-left-radius, $radii, spec);
+}
+
+@mixin border-right-radius($radii) {
+  @include prefixer(border-top-right-radius, $radii, spec);
+  @include prefixer(border-bottom-right-radius, $radii, spec);
 }

data/app/assets/stylesheets/css3/_box-shadow.scss

@@ -1,12 +1,3 @@
-// Box-Shadow Mixin Requires Sass v3.1.1+
-@mixin box-shadow ($shadow-1,
-  $shadow-2: false, $shadow-3: false,
-  $shadow-4: false, $shadow-5: false,
-  $shadow-6: false, $shadow-7: false,
-  $shadow-8: false, $shadow-9: false)
-  {
-    $full: compact($shadow-1, $shadow-2, $shadow-3, $shadow-4,
-                   $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9);
-
-    @include prefixer(box-shadow, $full, webkit, not moz);
+@mixin box-shadow ($shadows...) {
+    @include prefixer(box-shadow, $shadows, webkit spec);
 }

data/app/assets/stylesheets/css3/_box-sizing.scss

@@ -1,4 +1,4 @@
 @mixin box-sizing ($box) {
 //  content-box | border-box | inherit
-  @include prefixer(box-sizing, $box);
+  @include prefixer(box-sizing, $box, webkit moz spec);
 }

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

@@ -1,47 +1,47 @@
 @mixin columns($arg: auto) {
 // <column-count> || <column-width>
-  @include prefixer(columns, $arg);
+  @include prefixer(columns, $arg, webkit moz spec);
 }
 
 @mixin column-count($int: auto) {
 // auto || integer
-  @include prefixer(column-count, $int);
+  @include prefixer(column-count, $int, webkit moz spec);
 }
 
 @mixin column-gap($length: normal) {
 // normal || length
-  @include prefixer(column-gap, $length);
+  @include prefixer(column-gap, $length, webkit moz spec);
 }
 
 @mixin column-fill($arg: auto) {
 // auto || length
-  @include prefixer(columns-fill, $arg);
+  @include prefixer(columns-fill, $arg, webkit moz spec);
 }
 
 @mixin column-rule($arg) {
 // <border-width> || <border-style> || <color>
-  @include prefixer(column-rule, $arg);
+  @include prefixer(column-rule, $arg, webkit moz spec);
 }
 
 @mixin column-rule-color($color) {
-  @include prefixer(column-rule-color, $color);
+  @include prefixer(column-rule-color, $color, webkit moz spec);
 }
 
 @mixin column-rule-style($style: none) {
 // none | hidden | dashed | dotted | double | groove | inset | inset | outset | ridge | solid
-  @include prefixer(column-rule-style, $style);
+  @include prefixer(column-rule-style, $style, webkit moz spec);
 }
 
 @mixin column-rule-width ($width: none) {
-  @include prefixer(column-rule-width, $width);
+  @include prefixer(column-rule-width, $width, webkit moz spec);
 }
 
 @mixin column-span($arg: none) {
 // none || all
-  @include prefixer(column-span, $arg);
+  @include prefixer(column-span, $arg, webkit moz spec);
 }
 
 @mixin column-width($length: auto) {
 // auto || length
-  @include prefixer(column-width, $length);
+  @include prefixer(column-width, $length, webkit moz spec);
 }

data/app/assets/stylesheets/css3/_flex-box.scss

@@ -16,37 +16,37 @@
 
 @mixin box-orient($orient: inline-axis) {
 // horizontal|vertical|inline-axis|block-axis|inherit
-  @include prefixer(box-orient, $orient);
+  @include prefixer(box-orient, $orient, webkit moz spec);
 }
 
 @mixin box-pack($pack: start) {
 // start|end|center|justify
-  @include prefixer(box-pack, $pack);
+  @include prefixer(box-pack, $pack, webkit moz spec);
 }
 
 @mixin box-align($align: stretch) {
 // start|end|center|baseline|stretch
-  @include prefixer(box-align, $align);
+  @include prefixer(box-align, $align, webkit moz spec);
 }
 
 @mixin box-direction($direction: normal) {
 // normal|reverse|inherit
-  @include prefixer(box-direction, $direction);
+  @include prefixer(box-direction, $direction, webkit moz spec);
 }
 
 @mixin box-lines($lines: single) {
 // single|multiple
-  @include prefixer(box-lines, $lines);
+  @include prefixer(box-lines, $lines, webkit moz spec);
 }
 
 @mixin box-ordinal-group($int: 1) {
-  @include prefixer(box-ordinal-group, $int);
+  @include prefixer(box-ordinal-group, $int, webkit moz spec);
 }
 
 @mixin box-flex($value: 0.0) {
-  @include prefixer(box-flex, $value);
+  @include prefixer(box-flex, $value, webkit moz spec);
 }
 
 @mixin box-flex-group($int: 1) {
-  @include prefixer(box-flex-group, $int);
+  @include prefixer(box-flex-group, $int, webkit moz spec);
 }

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

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

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

@@ -56,7 +56,9 @@
 
   $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
 
-  $fallback-color: nth($G1, 1);
+  // Set $G1 as the default fallback color
+  $first-color: nth($full, 1);
+  $fallback-color: nth($first-color, 1);
 
   @if (type-of($fallback) == color) or ($fallback == "transparent") {
     $fallback-color: $fallback;

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

@@ -1,11 +1,11 @@
 @mixin transform($property: none) {
 //  none | <transform-function>
-  @include prefixer(transform, $property, webkit, moz, ms, o);
+  @include prefixer(transform, $property, webkit moz ms o spec);
 }
 
 @mixin transform-origin($axes: 50%) {
 // x-axis - left | center | right  | length | %
 // y-axis - top  | center | bottom | length | %
 // z-axis -                          length
-  @include prefixer(transform-origin, $axes, webkit, moz, ms, o);
+  @include prefixer(transform-origin, $axes, webkit moz ms o spec);
 }

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

@@ -3,70 +3,34 @@
 //          @include transition ((opacity, width), (1.0s, 2.0s), ease-in, (0, 2s));
 //          @include transition ($property:(opacity, width), $delay: (1.5s, 2.5s));
 
-@mixin transition ($prop-1: all 0.15s ease-out 0,
-  $prop-2: false, $prop-3: false,
-  $prop-4: false, $prop-5: false,
-  $prop-6: false, $prop-7: false,
-  $prop-8: false, $prop-9: false)
-  {
-    $full: compact($prop-1, $prop-2, $prop-3, $prop-4, $prop-5,
-                   $prop-6, $prop-7, $prop-8, $prop-9);
-
-  @include prefixer(transition, $full, webkit, moz, ms, o);
+@mixin transition ($properties...) {
+  @if length($properties) >= 1 {
+    @include prefixer(transition, $properties, webkit moz ms o spec);
+  }
+
+  @else {
+    $properties: all 0.15s ease-out 0;
+    @include prefixer(transition, $properties, webkit moz ms o spec);
+  }
 }
 
-
-
-@mixin transition-property ($prop-1: all,
-  $prop-2: false, $prop-3: false,
-  $prop-4: false, $prop-5: false,
-  $prop-6: false, $prop-7: false,
-  $prop-8: false, $prop-9: false)
-  {
-    $full: compact($prop-1, $prop-2, $prop-3, $prop-4, $prop-5,
-                   $prop-6, $prop-7, $prop-8, $prop-9);
-
-   -webkit-transition-property: transition-property-names($full, 'webkit');
-      -moz-transition-property: transition-property-names($full, 'moz');
-       -ms-transition-property: transition-property-names($full, 'ms');
-        -o-transition-property: transition-property-names($full, 'o');
-           transition-property: transition-property-names($full, false);
+@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 ($time-1: 0,
-  $time-2: false, $time-3: false,
-  $time-4: false, $time-5: false,
-  $time-6: false, $time-7: false,
-  $time-8: false, $time-9: false)
-  {
-    $full: compact($time-1, $time-2, $time-3, $time-4, $time-5,
-                   $time-6, $time-7, $time-8, $time-9);
-
-  @include prefixer(transition-duration, $full, webkit, moz, ms, o);
+@mixin transition-duration ($times...) {
+  @include prefixer(transition-duration, $times, webkit moz ms o spec);
 }
 
-@mixin transition-timing-function ($motion-1: ease,
-  $motion-2: false, $motion-3: false,
-  $motion-4: false, $motion-5: false,
-  $motion-6: false, $motion-7: false,
-  $motion-8: false, $motion-9: false)
-  {
-    $full: compact($motion-1, $motion-2, $motion-3, $motion-4, $motion-5,
-                   $motion-6, $motion-7, $motion-8, $motion-9);
-
+@mixin transition-timing-function ($motions...) {
 // ease | linear | ease-in | ease-out | ease-in-out | cubic-bezier()
-  @include prefixer(transition-timing-function, $full, webkit, moz, ms, o);
+  @include prefixer(transition-timing-function, $motions, webkit moz ms o spec);
 }
 
-@mixin transition-delay ($time-1: 0,
-  $time-2: false, $time-3: false,
-  $time-4: false, $time-5: false,
-  $time-6: false, $time-7: false,
-  $time-8: false, $time-9: false)
-  {
-    $full: compact($time-1, $time-2, $time-3, $time-4, $time-5,
-                   $time-6, $time-7, $time-8, $time-9);
-
-  @include prefixer(transition-delay, $full, webkit, moz, ms, o);
+@mixin transition-delay ($times...) {
+  @include prefixer(transition-delay, $times, webkit moz ms o spec);
 }
-

data/app/assets/stylesheets/css3/_user-select.scss

@@ -1,3 +1,3 @@
 @mixin user-select($arg: none) {
-  @include prefixer(user-select, $arg, webkit, moz, ms);
+  @include prefixer(user-select, $arg, webkit moz ms spec);
 }

data/app/assets/stylesheets/functions/_compact.scss

@@ -0,0 +1,17 @@
+// functions/_compact.scss
+
+/**
+ * Sass implementation of `compact` function from the bourbon.rb library
+ */
+@function compact($var-1, $var-2: false, $var-3: false, $var-4: false, $var-5: false, $var-6: false, $var-7: false, $var-8: false, $var-9: false, $var-10: false, $var-11: false, $var-12: false,$var-13: false, $var-14: false, $var-15: false, $var-16: false) {
+    $list: ();
+    $vars: $var-1, $var-2, $var-3, $var-4, $var-5, $var-6, $var-7, $var-8, $var-9, $var-10, $var-11, $var-12, $var-13, $var-14, $var-15;
+
+    @each $var in $vars {
+        @if $var {
+            $list: append($list, $var, comma);
+        }
+    }
+
+    @return $list;
+}

data/app/assets/stylesheets/functions/_deprecated-webkit-gradient.scss

@@ -18,7 +18,7 @@
       $gradient-list: join($gradient-list, $color-stop, comma);
     }
 
-    @else {
+    @else if $gradient != null {
       @if $i == $full-length {
         $percentage: 100%;
       }

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

@@ -1,23 +1,6 @@
-@function linear-gradient($pos: top, $G1: false, $G2: false,
-                       $G3: false, $G4: false,
-                       $G5: false, $G6: false,
-                       $G7: false, $G8: false,
-                       $G9: false, $G10: false) {
-
-  // Detect what type of value exists in $pos
-  $pos-type: type-of(nth($pos, 1));
-
-  // 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
-  }
-
+@function linear-gradient($gradients...) {
   $type: linear;
-  $gradient: compact($pos, $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
-  $type-gradient: append($type, $gradient, comma);
+  $type-gradient: append($type, $gradients, comma);
 
   @return $type-gradient;
 }
-

data/bourbon.gemspec

@@ -26,7 +26,7 @@ that support only CSS3 prefixed properties.
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency('sass', '>= 3.2')
+  s.add_dependency('sass', '>= 3.2.0')
   s.add_dependency('thor')
 
   s.add_development_dependency('aruba', '~> 0.4')

data/features/install.feature

@@ -6,9 +6,7 @@ Feature: Install bourbon files
     Then the sass directories should have been generated
     And the following directories should exist:
       | bourbon     |
-      | bourbon/lib |
     And the master bourbon partial should have been generated
-    And the lib files should have been generated
     And the output should contain "Bourbon files installed to bourbon/"
 
   Scenario: Generating does not overwrite an existing bourbon directory
@@ -21,9 +19,7 @@ Feature: Install bourbon files
     Then the sass directories with "custom_path" prefix should have been generated
     And the following directories should exist:
       | custom_path/bourbon     |
-      | custom_path/bourbon/lib |
     And the master bourbon partial should have been generated within "custom_path" directory
-    And the lib files should have been generated within "custom_path" directory
     And the output should contain "Bourbon files installed to custom_path/bourbon/"
 
   Scenario: Forcing install of bourbon

data/features/step_definitions/bourbon_steps.rb

@@ -15,13 +15,6 @@ Then /^the master bourbon partial should have been generated(?: within "([^"]+)"
   check_file_presence([bourbon_path(prefix, '_bourbon.scss')], true)
 end
 
-Then /^the lib files should have been generated(?: within "([^"]+)" directory)?$/ do |prefix|
-  check_file_presence([bourbon_path(prefix, 'lib/bourbon.rb')], true)
-  check_directory_presence([bourbon_path(prefix, 'lib/bourbon')], true)
-  check_file_presence([bourbon_path(prefix, 'lib/bourbon/sass_extensions.rb')], true)
-  check_directory_presence([bourbon_path(prefix, 'lib/bourbon/sass_extensions')], true)
-end
-
 Then /^bourbon should not have been generated$/ do
   check_directory_presence(['bourbon'], false)
 end

data/lib/bourbon.rb

@@ -20,4 +20,6 @@ module Bourbon
   end
 end
 
-require File.join(File.dirname(__FILE__), "/bourbon/sass_extensions")
+unless defined?(Sass)
+  require 'sass'
+end

data/lib/bourbon/generator.rb

@@ -49,8 +49,7 @@ module Bourbon
     end
 
     def install_files
-      make_lib_directory
-      copy_in_sass_extensions
+      make_install_directory
       copy_in_scss_files
     end
 
@@ -58,14 +57,8 @@ module Bourbon
       FileUtils.rm_rf("bourbon")
     end
 
-    def make_lib_directory
-      FileUtils.mkdir_p(install_path.join('lib', 'bourbon'))
-    end
-
-    def copy_in_sass_extensions
-      FileUtils.cp(File.join(lib_directory, 'bourbon.rb'), install_path.join('lib'))
-      FileUtils.cp(File.join(lib_bourbon_directory, 'sass_extensions.rb'), install_path.join('lib', 'bourbon'))
-      FileUtils.cp_r(File.join(lib_bourbon_directory, 'sass_extensions'), install_path.join('lib', 'bourbon'))
+    def make_install_directory
+      FileUtils.mkdir_p(install_path)
     end
 
     def copy_in_scss_files
@@ -80,14 +73,6 @@ module Bourbon
       File.join(top_level_directory, "app", "assets", "stylesheets")
     end
 
-    def lib_directory
-      File.join(top_level_directory, "lib")
-    end
-
-    def lib_bourbon_directory
-      File.join(top_level_directory, "lib", "bourbon")
-    end
-
     def top_level_directory
       File.dirname(File.dirname(File.dirname(__FILE__)))
     end

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "2.1.3"
+  VERSION = "3.0.0"
 end

data/readme.md

@@ -40,15 +40,13 @@ Import Bourbon at the beginning of application.css.scss. All additional styleshe
 
 [Help! I'm getting an undefined mixin error.](https://github.com/thoughtbot/bourbon/wiki/Rails-Help-%5C-Undefined-mixin)
 
-##### [Rails 3.0.x Install Instructions](https://github.com/thoughtbot/bourbon/wiki/Rails-3.0.x-Install)
-
-##### Rails 2.3 - follow the [non-rails installation](#non-rails)
+##### [Rails 3.0.x Install Instructions](https://github.com/thoughtbot/bourbon/wiki/Rails-3.0.x-Install) | [Rails 2.3 Install Instructions](https://github.com/thoughtbot/bourbon/wiki/Bourbon-v2.x-or-Rails-2.3-Install)
 
 # <span id="non-rails"></span>Non-Rails projects
 Bourbon includes an easy way to generate a directory with all the necessary files.  
 For command line help: `$ bourbon help` or visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/Command-Line-Tools)
 
-####Install
+####Install (Bourbon v3.0+)
 
     gem install bourbon
 
@@ -56,19 +54,15 @@ Install Bourbon into the current directory by generating the `bourbon` folder:
 
     bourbon install
 
-<small>The generated folder will contain all the mixins and other necessary Bourbon files.   
-It is recommended not to add or modify the Bourbon files so that you can update Bourbon easily.</small>
-
-#### Sass Watch
-*Sass Watch:* To output properly, Bourbon must be explicitly required (`-r`) by Sass at the command line:
+The generated folder will contain all the mixins and other necessary Bourbon files. It is recommended not to add or modify the Bourbon files so that you can update Bourbon easily.
 
-    # Example (project root directory)
-    sass --watch stylesheets/sass:stylesheets -r ./stylesheets/sass/bourbon/lib/bourbon.rb
+#### Import
 
 Lastly, import the mixins at the beginning of your stylesheet(s):
 
     @import 'bourbon/bourbon';
 
+Note: Bourbon no longer requires a custom `sass --watch` command for Bourbon v3.0+
 
 #### Other Commands
 Visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/Command-Line-Tools) for a complete list
@@ -76,6 +70,8 @@ Visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/C
     bourbon help
     bourbon update
     
+##### [Bourbon v2.x install instructions](https://github.com/thoughtbot/bourbon/wiki/Bourbon-v2.x-or-Rails-2.3-Install)
+
 -------
 # [Changelog](https://github.com/thoughtbot/bourbon/wiki)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -20,22 +20,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-05 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70313890203780 !ruby/object:Gem::Requirement
+  requirement: &70282866974140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70313890203780
+  version_requirements: *70282866974140
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70313890203160 !ruby/object:Gem::Requirement
+  requirement: &70282866973720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70313890203160
+  version_requirements: *70282866973720
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70313890202620 !ruby/object:Gem::Requirement
+  requirement: &70282866973180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70313890202620
+  version_requirements: *70282866973180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70313890202120 !ruby/object:Gem::Requirement
+  requirement: &70282866972700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313890202120
+  version_requirements: *70282866972700
 description: ! 'The purpose of Bourbon Vanilla Sass Mixins is to provide a comprehensive
   framework of
 
@@ -92,6 +92,7 @@ files:
 - Gemfile.lock
 - LICENSE
 - Rakefile
+- app/assets/stylesheets/_bourbon-deprecated-upcoming.scss
 - app/assets/stylesheets/_bourbon.scss
 - app/assets/stylesheets/addons/_button.scss
 - app/assets/stylesheets/addons/_clearfix.scss
@@ -117,10 +118,12 @@ files:
 - app/assets/stylesheets/css3/_image-rendering.scss
 - app/assets/stylesheets/css3/_inline-block.scss
 - app/assets/stylesheets/css3/_linear-gradient.scss
+- app/assets/stylesheets/css3/_perspective.scss
 - app/assets/stylesheets/css3/_radial-gradient.scss
 - app/assets/stylesheets/css3/_transform.scss
 - 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
@@ -141,9 +144,6 @@ files:
 - lib/bourbon.rb
 - lib/bourbon/engine.rb
 - lib/bourbon/generator.rb
-- lib/bourbon/sass_extensions.rb
-- lib/bourbon/sass_extensions/functions.rb
-- lib/bourbon/sass_extensions/functions/compact.rb
 - lib/bourbon/version.rb
 - lib/tasks/install.rake
 - readme.md

data/lib/bourbon/sass_extensions.rb

@@ -1,8 +0,0 @@
-module Bourbon::SassExtensions
-end
-
-unless defined?(Sass)
-  require 'sass'
-end
-
-require File.join(File.dirname(__FILE__), '/sass_extensions/functions')

data/lib/bourbon/sass_extensions/functions.rb

@@ -1,13 +0,0 @@
-module Bourbon::SassExtensions::Functions
-end
-
-require File.join(File.dirname(__FILE__), "/functions/compact")
-
-module Sass::Script::Functions
-  include Bourbon::SassExtensions::Functions::Compact
-end
-
-# Wierd that this has to be re-included to pick up sub-modules. Ruby bug?
-class Sass::Script::Functions::EvaluationContext
-  include Sass::Script::Functions
-end

data/lib/bourbon/sass_extensions/functions/compact.rb

@@ -1,14 +0,0 @@
-# Compact function pulled from compass
-module Bourbon::SassExtensions::Functions::Compact
-
-  def compact(*args)
-    sep = :comma
-    if args.size == 1 && args.first.is_a?(Sass::Script::List)
-      list = args.first
-      args = list.value
-      sep = list.separator
-    end
-    Sass::Script::List.new(args.reject{|a| !a.to_bool}, sep)
-  end
-
-end