bourbon-compass 3.1.8 → 3.2.0.beta.1.a

data/stylesheets/bourbon/css3/_transition.scss

@@ -1,7 +1,7 @@
 // Shorthand mixin. Supports multiple parentheses-deliminated values for each variable.
-// Example: @include transition (all, 2.0s, ease-in-out);
-//          @include transition ((opacity, width), (1.0s, 2.0s), ease-in, (0, 2s));
-//          @include transition ($property:(opacity, width), $delay: (1.5s, 2.5s));
+// Example: @include transition (all 2s ease-in-out);
+//          @include transition (opacity 1s ease-in 2s, width 2s ease-out);
+//          @include transition-property (transform, opacity);
 
 @mixin transition ($properties...) {
   @if length($properties) >= 1 {
@@ -9,7 +9,7 @@
   }
 
   @else {
-    $properties: all 0.15s ease-out 0;
+    $properties: all 0.15s ease-out 0s;
     @include prefixer(transition, $properties, webkit moz spec);
   }
 }

data/stylesheets/bourbon/functions/_golden-ratio.scss

@@ -0,0 +1,3 @@
+@function golden-ratio($value, $increment) {
+  @return modular-scale($value, $increment, $golden)
+}

data/stylesheets/bourbon/functions/_modular-scale.scss

@@ -1,40 +1,66 @@
+// Scaling Varaibles
+$golden:           1.618;
+$minor-second:     1.067;
+$major-second:     1.125;
+$minor-third:      1.2;
+$major-third:      1.25;
+$perfect-fourth:   1.333;
+$augmented-fourth: 1.414;
+$perfect-fifth:    1.5;
+$minor-sixth:      1.6;
+$major-sixth:      1.667;
+$minor-seventh:    1.778;
+$major-seventh:    1.875;
+$octave:           2;
+$major-tenth:      2.5;
+$major-eleventh:   2.667;
+$major-twelfth:    3;
+$double-octave:    4;
+
 @function modular-scale($value, $increment, $ratio) {
+  $v1: nth($value, 1);
+  $v2: nth($value, length($value));
+  $value: $v1;
+
+  // scale $v2 to just above $v1
+  @while $v2 > $v1 {
+    $v2: ($v2 / $ratio); // will be off-by-1
+  }
+  @while $v2 < $v1 {
+    $v2: ($v2 * $ratio); // will fix off-by-1
+  }
+
+  // check AFTER scaling $v2 to prevent double-counting corner-case
+  $double-stranded: $v2 > $v1;
+
   @if $increment > 0 {
     @for $i from 1 through $increment {
-      $value: ($value * $ratio);
+      @if $double-stranded and ($v1 * $ratio) > $v2 {
+        $value: $v2;
+        $v2: ($v2 * $ratio);
+      } @else {
+        $v1: ($v1 * $ratio);
+        $value: $v1;
+      }
     }
   }
 
   @if $increment < 0 {
-    $increment: abs($increment);
-    @for $i from 1 through $increment {
-      $value: ($value / $ratio);
+    // adjust $v2 to just below $v1
+    @if $double-stranded {
+      $v2: ($v2 / $ratio);
+    }
+
+    @for $i from $increment through -1 {
+      @if $double-stranded and ($v1 / $ratio) < $v2 {
+        $value: $v2;
+        $v2: ($v2 / $ratio);
+      } @else {
+        $v1: ($v1 / $ratio);
+        $value: $v1;
+      }
     }
   }
 
   @return $value;
 }
-
-//  div {
-//                     Increment Up GR with positive value
-//   font-size:        modular-scale(14px,   1, 1.618); // returns: 22.652px
-//
-//                     Increment Down GR with negative value
-//   font-size:        modular-scale(14px,  -1, 1.618); // returns: 8.653px
-//
-//                     Can be used with ceil(round up) or floor(round down)
-//   font-size: floor( modular-scale(14px, 1, 1.618) ); // returns: 22px
-//   font-size:  ceil( modular-scale(14px, 1, 1.618) ); // returns: 23px
-//  }
-//
-// modularscale.com
-
-@function golden-ratio($value, $increment) {
-  @return modular-scale($value, $increment, 1.618)
-}
-
-//  div {
-//    font-size: golden-ratio(14px, 1); // returns: 22.652px
-//  }
-//
-// goldenratiocalculator.com

data/stylesheets/bourbon/functions/_px-to-em.scss

@@ -2,7 +2,12 @@
 // eg. for a relational value of 12px write em(12) when the parent is 16px
 // if the parent is another value say 24px write em(12, 24)
 
-@function em($pxval, $base: 16) {
+@function em($pxval, $base: $em-base) {
+  @if not unitless($pxval) {
+      $pxval: strip-units($pxval);
+  }
+  @if not unitless($base) {
+      $base: strip-units($base);
+  }
   @return ($pxval / $base) * 1em;
 }
-

data/stylesheets/bourbon/functions/_radial-gradient.scss

@@ -1,11 +1,11 @@
 // This function is required and used by the background-image mixin.
 @function radial-gradient($G1,        $G2,
-                       $G3: false, $G4: false,
-                       $G5: false, $G6: false,
-                       $G7: false, $G8: false,
-                       $G9: false, $G10: false,
-                       $pos: null,
-                       $shape-size: null) {
+                          $G3: null,  $G4: null,
+                          $G5: null,  $G6: null,
+                          $G7: null,  $G8: null,
+                          $G9: null,  $G10: null,
+                          $pos: null,
+                          $shape-size: null) {
 
   $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
   $G1:  nth($data, 1);
@@ -14,7 +14,7 @@
   $shape-size: nth($data, 4);
 
   $type: radial;
-  $gradient: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
+  $gradient: $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10;
 
   $type-gradient: $type, $shape-size $pos, $gradient;
   @return $type-gradient;

data/stylesheets/bourbon/functions/_strip-units.scss

@@ -0,0 +1,5 @@
+// Srtips the units from a value. e.g. 12px -> 12
+
+@function strip-units($val) {
+  @return ($val / ($val * 0 + 1));
+}

data/stylesheets/bourbon/functions/_unpack.scss

@@ -0,0 +1,17 @@
+// Convert shorthand to the 4-value syntax
+
+@function unpack($shorthand) {
+  @if length($shorthand) == 1 {
+    @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1);
+  }
+  @else if length($shorthand) == 2 {
+    @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2);
+  }
+  @else if length($shorthand) == 3 {
+    @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2);
+  }
+  @else {
+    @return $shorthand;
+  }
+}
+

data/stylesheets/bourbon/helpers/_radial-arg-parser.scss

@@ -22,7 +22,7 @@
           $pos: $pos nth($value, $i);
         }
       }
-      $G1: false;
+      $G1: null;
     }
 
     // If not spec calculate correct values
@@ -38,7 +38,7 @@
           $pos: $value;
 
           @if $pos == $G1 {
-            $G1: false;
+            $G1: null;
           }
         }
 
@@ -55,11 +55,11 @@
           $shape-size: $value;
 
           @if $value == $G1 {
-            $G1: false;
+            $G1: null;
           }
 
           @else if $value == $G2 {
-            $G2: false;
+            $G2: null;
           }
         }
       }

data/stylesheets/bourbon/settings/_prefixer.scss

@@ -0,0 +1,6 @@
+// Variable settings for /addons/prefixer.scss
+$prefix-for-webkit:    true !default;
+$prefix-for-mozilla:   true !default;
+$prefix-for-microsoft: true !default;
+$prefix-for-opera:     true !default;
+$prefix-for-spec:      true !default; // required for keyframe mixin

data/stylesheets/bourbon/settings/_px-to-em.scss

@@ -0,0 +1 @@
+$em-base: 16px !default;

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bourbon-compass
 version: !ruby/object:Gem::Version
-  version: 3.1.8
-  prerelease: 
+  version: 3.2.0.beta.1.a
+  prerelease: 6
 platform: ruby
 authors:
 - Jed Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-11 00:00:00.000000000 Z
+date: 2013-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.13.alpha.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: 0.13.alpha.10
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,8 +42,8 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
-description: ThoughtBot's Bourbon packaged as a Compass extension.
+        version: 3.3.0.rc.1
+description: thoughtbot's Bourbon packaged as a Compass extension.
 email: jed@jedfoster.com
 executables: []
 extensions: []
@@ -54,11 +54,14 @@ files:
 - stylesheets/bourbon/_bourbon.scss
 - stylesheets/bourbon/addons/_button.scss
 - stylesheets/bourbon/addons/_clearfix.scss
+- stylesheets/bourbon/addons/_directional-values.scss
+- stylesheets/bourbon/addons/_ellipsis.scss
 - stylesheets/bourbon/addons/_font-family.scss
 - stylesheets/bourbon/addons/_hide-text.scss
 - stylesheets/bourbon/addons/_html5-input-types.scss
 - stylesheets/bourbon/addons/_position.scss
 - stylesheets/bourbon/addons/_prefixer.scss
+- stylesheets/bourbon/addons/_rem.scss
 - stylesheets/bourbon/addons/_retina-image.scss
 - stylesheets/bourbon/addons/_size.scss
 - stylesheets/bourbon/addons/_timing-functions.scss
@@ -71,10 +74,12 @@ files:
 - stylesheets/bourbon/css3/_border-image.scss
 - stylesheets/bourbon/css3/_border-radius.scss
 - stylesheets/bourbon/css3/_box-sizing.scss
+- stylesheets/bourbon/css3/_calc.scss
 - stylesheets/bourbon/css3/_columns.scss
 - stylesheets/bourbon/css3/_flex-box.scss
 - stylesheets/bourbon/css3/_font-face.scss
 - stylesheets/bourbon/css3/_hidpi-media-query.scss
+- stylesheets/bourbon/css3/_hyphens.scss
 - stylesheets/bourbon/css3/_image-rendering.scss
 - stylesheets/bourbon/css3/_inline-block.scss
 - stylesheets/bourbon/css3/_keyframes.scss
@@ -85,22 +90,25 @@ files:
 - stylesheets/bourbon/css3/_transform.scss
 - stylesheets/bourbon/css3/_transition.scss
 - stylesheets/bourbon/css3/_user-select.scss
-- stylesheets/bourbon/functions/_compact.scss
 - stylesheets/bourbon/functions/_flex-grid.scss
+- stylesheets/bourbon/functions/_golden-ratio.scss
 - stylesheets/bourbon/functions/_grid-width.scss
 - stylesheets/bourbon/functions/_linear-gradient.scss
 - stylesheets/bourbon/functions/_modular-scale.scss
 - stylesheets/bourbon/functions/_px-to-em.scss
 - stylesheets/bourbon/functions/_radial-gradient.scss
+- stylesheets/bourbon/functions/_strip-units.scss
 - stylesheets/bourbon/functions/_tint-shade.scss
 - stylesheets/bourbon/functions/_transition-property-name.scss
-- stylesheets/bourbon/helpers/_deprecated-webkit-gradient.scss
+- stylesheets/bourbon/functions/_unpack.scss
 - stylesheets/bourbon/helpers/_gradient-positions-parser.scss
 - stylesheets/bourbon/helpers/_linear-positions-parser.scss
 - stylesheets/bourbon/helpers/_radial-arg-parser.scss
 - stylesheets/bourbon/helpers/_radial-positions-parser.scss
 - stylesheets/bourbon/helpers/_render-gradients.scss
 - stylesheets/bourbon/helpers/_shape-size-stripper.scss
+- stylesheets/bourbon/settings/_prefixer.scss
+- stylesheets/bourbon/settings/_px-to-em.scss
 homepage: https://github.com/jedfoster/bourbon-compass
 licenses: []
 post_install_message: 
@@ -116,13 +124,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: ThoughtBot's Bourbon packaged as a Compass extension.
+summary: thoughtbot's Bourbon packaged as a Compass extension.
 test_files: []

data/stylesheets/bourbon/functions/_compact.scss

@@ -1,11 +0,0 @@
-// Remove `false` values from a list
-
-@function compact($vars...) {
-  $list: ();
-  @each $var in $vars {
-    @if $var {
-      $list: append($list, $var, comma);
-    }
-  }
-  @return $list;
-}

data/stylesheets/bourbon/helpers/_deprecated-webkit-gradient.scss

@@ -1,39 +0,0 @@
-// Render Deprecated Webkit Gradient - Linear || Radial
-//************************************************************************//
-@function _deprecated-webkit-gradient($type,
-                                     $deprecated-pos1, $deprecated-pos2,
-                                     $full,
-                                     $deprecated-radius1: false, $deprecated-radius2: false) {
-  $gradient-list: ();
-  $gradient: false;
-  $full-length: length($full);
-  $percentage: false;
-  $gradient-type: $type;
-
-  @for $i from 1 through $full-length {
-    $gradient: nth($full, $i);
-
-    @if length($gradient) == 2 {
-      $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);
-    }
-  }
-
-  @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;
-}