bourbon 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73447b1d628373071843b3fab65ebd7700076340
-  data.tar.gz: 0bc7469830cc0e0b1402eee18161fd0343a6d9a2
+  metadata.gz: 34af2723961b9a89e6513f9b89be85dcddc1ce9a
+  data.tar.gz: 59153423a0c8950509e9330781dc52cc32d2792d
 SHA512:
-  metadata.gz: 2e92fa6bdde9d337701ac830bec98a57ea1306b3c1fe7fc7ee8093622aa3b111ee1704663ffd136d6f04ede4d9a53b0f74ad7e6a694bb1172e8455657348c075
-  data.tar.gz: 1cabd083d149cef4d1f225b76a03e61e88cf335273aeb02cb40b165193eeeb68ff6a4500b6872823d2104bbb496f9adba954d4e89b783244a9ac9fe113e5bccd
+  metadata.gz: c9d9e1f7ea4dbd6edd16ef0f1d30e2488a9ba271a704e1326d63a810b5b573bc74f58ae7c5c518542447c8a89b8b25d35e6e9a8502e77c92773787c119ad5c7e
+  data.tar.gz: 483a2be7af0498b89d3497bff4825e9f80692533b2c1e12155869d3074b0e47682ded577d3b12a647ee643fc15853eb529a9e668a325038ff3607d81ab38db0b

data/LICENSE.md

@@ -1,8 +1,6 @@
-LICENSE
+The MIT License (MIT)
 
-The MIT License
-
-Copyright © 2011–2014 [thoughtbot, inc.](http://thoughtbot.com)
+Copyright © 2011–2015 [thoughtbot, inc.](http://thoughtbot.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the “Software”), to deal
@@ -11,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -18,7 +18,7 @@ The mixins contain vendor specific prefixes for all CSS3 properties for support
 ## Requirements
 
 - [Sass](https://github.com/sass/sass) 3.3+
-- :warning: If you are using Bourbon with **LibSass**, **sass-rails**, **Compass** (pre 1.0.0), **Foundation** or need **Sass 3.2 support**, you should [use Bourbon 3.2.x](#installing-older-versions-of-bourbon).
+- :warning: If you are using **LibSass**, you need to [use Bourbon 3.2.3](#installing-older-versions-of-bourbon).
 
 ## Installation
 
@@ -66,19 +66,19 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
   bundle install
   ```
 
-3. Restart your server and rename `application.css` to `application.css.scss`:
+3. Restart your server and rename `application.css` to `application.scss`:
 
   ```bash
-  mv app/assets/stylesheets/application.css app/assets/stylesheets/application.css.scss
+  mv app/assets/stylesheets/application.css app/assets/stylesheets/application.scss
   ```
 
-4. Delete the sprocket directive in `application.css.scss` ([why?](https://github.com/thoughtbot/bourbon/wiki/Rails-Sprockets)):
+4. Delete the Sprockets directive in `application.scss`:
 
   ```scss
   *= require_tree .
   ```
 
-5. Import Bourbon at the beginning of `application.css.scss`. All additional stylesheets should be imported below Bourbon:
+5. Import Bourbon at the beginning of `application.scss`. All additional stylesheets should be imported below Bourbon:
 
   ```scss
   @import "bourbon";
@@ -119,6 +119,8 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
 - [Bitters](https://github.com/thoughtbot/bitters): Scaffold styles, variables and structure for Bourbon projects
 - [Refills](https://github.com/thoughtbot/refills): Prepackaged patterns and components built with Bourbon, Neat and Bitters
 
+Also check out [Proteus](https://github.com/thoughtbot/proteus), a collection of useful starter kits to help you prototype faster. Each kit comes with Bourbon, Neat and Bitters out-of-the-box.
+
 ## Credits
 
 [![thoughtbot](http://images.thoughtbot.com/bourbon/thoughtbot-logo.svg)](http://thoughtbot.com)
@@ -127,4 +129,4 @@ Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com). Tw
 
 ## License
 
-Copyright © 2011–2014 [thoughtbot, inc](http://thoughtbot.com). Bourbon is free software, and may be redistributed under the terms specified in the [license](LICENSE.md).
+Copyright © 2011–2015 [thoughtbot, inc](http://thoughtbot.com). Bourbon is free software, and may be redistributed under the terms specified in the [license](LICENSE.md).

data/app/assets/stylesheets/_bourbon.scss

@@ -1,6 +1,6 @@
-// Bourbon 4.1.0
+// Bourbon 4.1.1
 // http://bourbon.io
-// Copyright 2011-2014 thoughtbot, inc.
+// Copyright 2011-2015 thoughtbot, inc.
 // MIT License
 
 // Settings

data/app/assets/stylesheets/addons/_font-family.scss

@@ -1,5 +1,5 @@
-$georgia: Georgia, Cambria, "Times New Roman", Times, serif;
-$helvetica: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
-$lucida-grande: "Lucida Grande", Tahoma, Verdana, Arial, sans-serif;
-$monospace: "Bitstream Vera Sans Mono", Consolas, Courier, monospace;
-$verdana: Verdana, Geneva, sans-serif;
+$georgia: "Georgia", "Cambria", "Times New Roman", "Times", serif;
+$helvetica: "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;
+$lucida-grande: "Lucida Grande", "Tahoma", "Verdana", "Arial", sans-serif;
+$monospace: "Bitstream Vera Sans Mono", "Consolas", "Courier", monospace;
+$verdana: "Verdana", "Geneva", sans-serif;

data/app/assets/stylesheets/helpers/_font-source-declaration.scss

@@ -19,16 +19,23 @@
   $src: null;
 
   $formats-map: (
-    eot:   $font-url + "(\"#{$file-path}.eot?#iefix\")" format("embedded-opentype"),
-    woff2: $font-url + "(\"#{$file-path}.woff2\")" format("woff2"),
-    woff:  $font-url + "(\"#{$file-path}.woff\")" format("woff"),
-    ttf:   $font-url + "(\"#{$file-path}.ttf\")" format("truetype"),
-    svg:   $font-url + "(\"#{$file-path}.svg##{$font-family}\")" format("svg")
+    eot:   "#{$file-path}.eot?#iefix" format("embedded-opentype"),
+    woff2: "#{$file-path}.woff2" format("woff2"),
+    woff:  "#{$file-path}.woff" format("woff"),
+    ttf:   "#{$file-path}.ttf" format("truetype"),
+    svg:   "#{$file-path}.svg##{$font-family}" format("svg")
   );
 
-  @each $format, $file-path in $formats-map {
-    @if contains($file-formats, $format) {
-      $src: append($src, $file-path, comma);
+  @each $key, $values in $formats-map {
+    @if contains($file-formats, $key) {
+      $file-path: nth($values, 1);
+      $font-format: nth($values, 2);
+
+      @if $asset-pipeline == true {
+        $src: append($src, font-url($file-path) $font-format, comma);
+      } @else {
+        $src: append($src, url($file-path) $font-format, comma);
+      }
     }
   }
 

data/bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bourbon",
   "description": "A simple and lightweight mixin library for Sass.",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "main": "app/assets/stylesheets/_bourbon.scss",
   "license": "MIT",
   "ignore": [

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bourbon",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "A simple and lightweight mixin library for Sass.",
   "keywords": [
     "css",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Andres Mejia
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass