bourbon 1.3.3 → 1.3.4

data/app/assets/stylesheets/_bourbon.scss

@@ -1,6 +1,6 @@
 // Custom Functions
 @import "functions/deprecated-webkit-gradient";
-@import "functions/golden-ratio";
+@import "functions/modular-scale";
 @import "functions/grid-width";
 @import "functions/tint-shade";
 

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

@@ -2,7 +2,8 @@
                        $G3: false, $G4: false,
                        $G5: false, $G6: false,
                        $G7: false, $G8: false,
-                       $G9: false, $G10: false) {
+                       $G9: false, $G10: false,
+                       $fallback: false) {
   // Detect what type of value exists in $pos
   $pos-type: type-of(nth($pos, 1));
 
@@ -15,7 +16,15 @@
 
   $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
 
-  background-color:  nth($G1, 1);
+  // Set $G1 as the default fallback color
+  $fallback-color: nth($G1, 1);
+
+  // If $fallback is a color use that color as the fallback color
+  @if type-of($fallback) == color {
+    $fallback-color: $fallback;
+  }
+
+  background-color: $fallback-color;
   background-image: deprecated-webkit-gradient(linear, $full); // Safari <= 5.0
   background-image:  -webkit-linear-gradient($pos, $full); // Safari 5.1+, Chrome
   background-image:     -moz-linear-gradient($pos, $full);
@@ -27,5 +36,6 @@
 
 // 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/functions/_modular_scale.scss

@@ -0,0 +1,40 @@
+@function modular-scale($value, $increment, $ratio) {
+  @if $increment > 0 {
+    @for $i from 1 through $increment {
+      $value: ($value * $ratio);
+    }
+  }
+
+  @if $increment < 0 {
+    $increment: abs($increment);
+    @for $i from 1 through $increment {
+      $value: ($value / $ratio);
+    }
+  }
+
+  @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/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/readme.md

@@ -18,6 +18,8 @@ Then run:
 
     $ bundle install
 
+Bourbon On [RubyGems](https://rubygems.org/gems/bourbon)
+
 ## Rails 3.1.x
 
 Rename application.css to application.css.scss:
@@ -39,7 +41,7 @@ Import all additional stylesheets from your app/assets/stylesheets directory und
     @import "home";
     @import "users";
 
-## Rails 3.0.10 and below
+## Rails 3.0.x and below
 For Rails < 3.1 you must run the installation rake task. Please note, you should run this task every time a new version of Bourbon is released.
 This will copy the Sass files into your project's public/stylesheets/sass directory.
 
@@ -53,7 +55,7 @@ Import the mixins at the beginning of your stylesheet
 
     rake bourbon:install[app/stylesheets]
 
-# Install without Rails
+# Install in a non-rails project (static site, jekyll, wordpress, other...)
 Bourbon includes an easy way to generate a directory with all the necessary files.  
 Install the bourbon gem:
 
@@ -90,13 +92,14 @@ Bourbon aims to provide support for CSS3 properties that are not yet fully suppo
 
 
 # All Supported Functions, Mixins, and Addons
-[View the Bourbon documentation](http://thoughtbot.com/bourbon)  
+[View the Bourbon documentation](http://thoughtbot.com/bourbon)
 
 *@ denotes a mixin and must be prefaced with @include*
 
     #Functions
     --------------------------------
       compact(*args)
+      modular-scale(*args)
       golden-ratio(*args)
       grid-width(*args)
       linear-gradient(*args)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -19,11 +19,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-22 00:00:00.000000000 Z
+date: 2012-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70264008406980 !ruby/object:Gem::Requirement
+  requirement: &70155229817940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -31,10 +31,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70264008406980
+  version_requirements: *70155229817940
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70264008406480 !ruby/object:Gem::Requirement
+  requirement: &70155229817440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -42,7 +42,7 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70264008406480
+  version_requirements: *70155229817440
 description: ! 'The purpose of Bourbon Vanilla Sass Mixins is to provide a comprehensive
   framework of
 
@@ -91,9 +91,9 @@ files:
 - app/assets/stylesheets/css3/_transform.scss
 - app/assets/stylesheets/css3/_transition.scss
 - app/assets/stylesheets/functions/_deprecated-webkit-gradient.scss
-- app/assets/stylesheets/functions/_golden-ratio.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/_radial-gradient.scss
 - app/assets/stylesheets/functions/_tint-shade.scss
 - bin/bourbon

data/app/assets/stylesheets/functions/_golden-ratio.scss

@@ -1,31 +0,0 @@
-@function golden-ratio($value, $increment) {
-  @if $increment > 0 {
-    @for $i from 1 through $increment {
-      $value: ($value * 1.618);
-    }
-  }
-
-  @if $increment < 0 {
-    $increment: abs($increment);
-    @for $i from 1 through $increment {
-      $value: ($value / 1.618);
-    }
-  }
-
-  @return $value;
-}
-
-//  div {
-//                      Increment Up GR with positive value
-//    font-size:        golden-ratio(14px,  1);    // returns: 22.652px
-//
-//                      Increment Down GR with negative value
-//    font-size:        golden-ratio(14px, -1);    // returns: 8.653px
-//
-//                     Can be used with ceil(round up) or floor(round down)
-//    font-size: floor( golden-ratio(14px,  1) );  // returns: 22px
-//    font-size:  ceil( golden-ratio(14px,  1) );  // returns: 23px
-//  }
-//
-// modularscale.com
-// goldenratiocalculator.com