bourbon 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41411be80fcec3ef639f565ce53acb117b97b404
-  data.tar.gz: b55f7babf130479756b841b3187655f09e634bef
+  metadata.gz: 82349a03d66ed0c3f92abf6f96f1fac2a59b61a4
+  data.tar.gz: aa833788f3cd41270c5a7e947559b86296b5b435
 SHA512:
-  metadata.gz: b908ff10e7e76c69c0ceb6b92686716a369e8e1d8a97c5a9940125ae6317c4ff431c04ac390ade56fafdbae4a825de0e356b474309ea648b50852fc74984d3a0
-  data.tar.gz: 24a680d23e8097f2b11c535af877bd1bef0d46cf4dce359bbd83686b33830a9b89f3df6fc3cf86011fe65bbab9818985abd88564220e5786d6f4bdd4e1c6bb53
+  metadata.gz: 0e7f67108c6caca33adb567900a3f043424c55922cf7b3431246bf88c36f914df596d0449a215e38e0effd9d65b2c4ed56cc915f19cf81320b423500f5ac5428
+  data.tar.gz: d345ed538350de5860f11142eeb6543f69d754e69473cab581d3787d9c594516c086a5de59bad8374327897aef0abe57da94e5a68baa4f8e5700c63c7dac70d2

data/app/assets/stylesheets/_bourbon.scss

@@ -1,6 +1,7 @@
 // Settings
 @import "settings/prefixer";
 @import "settings/px-to-em";
+@import "settings/asset-pipeline";
 
 // Custom Helpers
 @import "helpers/convert-units";

data/app/assets/stylesheets/addons/_retina-image.scss

@@ -1,4 +1,4 @@
-@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: false) {
+@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {
   @if $asset-pipeline {
     background-image: image-url("#{$filename}.#{$extension}");
   }

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

@@ -10,7 +10,7 @@
     height: $height;
   }
 
-  @if $width == auto or (type-of($height) == number and not unitless($width)) {
+  @if $width == auto or (type-of($width) == number and not unitless($width)) {
     width: $width;
   }
 }

data/app/assets/stylesheets/addons/_timing-functions.scss

@@ -1,5 +1,5 @@
 // CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie)
-// Timing functions are the same as demo'ed here: http://jqueryui.com/demos/effect/easing.html
+// Timing functions are the same as demo'ed here: http://jqueryui.com/resources/demos/effect/easing.html
 
 // EASE IN
 $ease-in-quad:      cubic-bezier(0.550,  0.085, 0.680, 0.530);

data/app/assets/stylesheets/css3/_font-face.scss

@@ -1,6 +1,6 @@
 // Order of the includes matters, and it is: normal, bold, italic, bold+italic.
 
-@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
+@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
   @font-face {
     font-family: $font-family;
     font-weight: $weight;

data/app/assets/stylesheets/settings/_asset-pipeline.scss

@@ -0,0 +1 @@
+$asset-pipeline: false !default;

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bourbon",
   "homepage": "http://bourbon.io/",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "main": "dist/_bourbon.scss",
   "ignore": [
     "app",

data/dist/_bourbon.scss

@@ -1,6 +1,7 @@
 // Settings
 @import "settings/prefixer";
 @import "settings/px-to-em";
+@import "settings/asset-pipeline";
 
 // Custom Helpers
 @import "helpers/convert-units";

data/dist/addons/_retina-image.scss

@@ -1,4 +1,4 @@
-@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: false) {
+@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {
   @if $asset-pipeline {
     background-image: image-url("#{$filename}.#{$extension}");
   }

data/dist/addons/_size.scss

@@ -10,7 +10,7 @@
     height: $height;
   }
 
-  @if $width == auto or (type-of($height) == number and not unitless($width)) {
+  @if $width == auto or (type-of($width) == number and not unitless($width)) {
     width: $width;
   }
 }

data/dist/addons/_timing-functions.scss

@@ -1,5 +1,5 @@
 // CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie)
-// Timing functions are the same as demo'ed here: http://jqueryui.com/demos/effect/easing.html
+// Timing functions are the same as demo'ed here: http://jqueryui.com/resources/demos/effect/easing.html
 
 // EASE IN
 $ease-in-quad:      cubic-bezier(0.550,  0.085, 0.680, 0.530);

data/dist/css3/_font-face.scss

@@ -1,6 +1,6 @@
 // Order of the includes matters, and it is: normal, bold, italic, bold+italic.
 
-@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
+@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
   @font-face {
     font-family: $font-family;
     font-weight: $weight;

data/dist/settings/_asset-pipeline.scss

@@ -0,0 +1 @@
+$asset-pipeline: false !default;

data/lib/bourbon.rb

@@ -22,6 +22,7 @@ module Bourbon
       end
     end
   else
-    Sass.load_paths << File.expand_path("../../app/assets/stylesheets", __FILE__)
+    bourbon_path = File.expand_path("../../app/assets/stylesheets", __FILE__)
+    ENV["SASS_PATH"] = [ENV["SASS_PATH"], bourbon_path].compact.join(File::PATH_SEPARATOR)
   end
 end

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "4.0.1"
+  VERSION = "4.0.2"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bourbon",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "A simple and lightweight mixin library for Sass.",
   "main": "dist/_bourbon.scss",
   "scripts": {

data/readme.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/bourbon.png)](http://badge.fury.io/rb/bourbon) [![Code Climate](https://codeclimate.com/github/thoughtbot/bourbon.png)](https://codeclimate.com/github/thoughtbot/bourbon)  [![Gitter chat](https://badges.gitter.im/thoughtbot/bourbon.png)](https://gitter.im/thoughtbot/bourbon)
 
 -
-:warning: Bourbon **4.0.0** requires Sass **3.3.x**. If you are using **libsass** or **sass-rails** use **3.2.0**.
+:warning: Bourbon **4.0.0** requires Sass **3.3.x**. If you are using **libsass** or **sass-rails** use Bourbon **3.2.x**.
 
 ## A lightweight mixin library for Sass
 Bourbon is a library of pure sass mixins that are designed to be simple
@@ -21,7 +21,7 @@ browsers that support only CSS3 prefixed properties. Bourbon uses SCSS syntax.
 ### [Documentation & Demo](http://bourbon.io)
 
 ### Requirements
-Sass 3.2+
+Sass 3.3+
 
 ### Install for Rails 3.1+
 In your Gemfile:
@@ -86,7 +86,7 @@ Visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/C
 ##### [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)
+- [Changelog](https://github.com/thoughtbot/bourbon/releases)
 - [Browser support](https://github.com/thoughtbot/bourbon/wiki/Browser-Support)
 
 ### Chat with us

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Phil LaPier
@@ -20,62 +20,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -92,8 +92,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".npmignore"
+- .gitignore
+- .npmignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -164,6 +164,7 @@ files:
 - app/assets/stylesheets/helpers/_render-gradients.scss
 - app/assets/stylesheets/helpers/_shape-size-stripper.scss
 - app/assets/stylesheets/helpers/_str-to-num.scss
+- app/assets/stylesheets/settings/_asset-pipeline.scss
 - app/assets/stylesheets/settings/_prefixer.scss
 - app/assets/stylesheets/settings/_px-to-em.scss
 - bin/bourbon
@@ -235,6 +236,7 @@ files:
 - dist/helpers/_render-gradients.scss
 - dist/helpers/_shape-size-stripper.scss
 - dist/helpers/_str-to-num.scss
+- dist/settings/_asset-pipeline.scss
 - dist/settings/_prefixer.scss
 - dist/settings/_px-to-em.scss
 - features/install.feature
@@ -260,12 +262,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []