bourbon 4.0.0.rc1 → 4.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c35402f56d5005b99f011972d15317ea8196b4bc
-  data.tar.gz: da552ec66bc668f0083df80676f66fb91a27a937
+  metadata.gz: d4ec8cb193e50318af09c3c18d7a6e471193e13b
+  data.tar.gz: 756e61479b6214e058570b4f5e3302c697bb3c80
 SHA512:
-  metadata.gz: ecd2ca09115c189da37b6b4601922da210ea174757f19ed521abd4a57e67fad80523bd34f080bf0a2db2b31e66254cf8c63e5e9c574b7661844f7cdcd8e6041c
-  data.tar.gz: e892f06ca1b0be6e7e73a0e138dcabe5a6ccbbbcffc4a7663970b6dd666fb610c026c489512c93cf1f62ca12c19fd8956733fcf9507c7a8560ac2b3f770a6c00
+  metadata.gz: fe4c02c6daac6fc418444a2363cbe6b0ce0d206da99dcfa3ec83117bd78d5ddd052a430c51941e5c4e0c8259694780a22598bf9cd65b886846300bc58fc46d0b
+  data.tar.gz: d2c636905c0dd1cece58aca3988c0d3123906644fa557ff37a0ac38600e4408614dfab0b6b7e0a74e1218809b83f69adf4db305f4bb8148d40d30487c6b22eb0

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     bourbon (4.0.0.rc1)
-      sass (>= 3.3.0.rc.2)
+      sass (~> 3.3)
       thor
 
 GEM
@@ -36,7 +36,7 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sass (3.3.3)
+    sass (3.3.4)
     term-ansicolor (1.0.7)
     thor (0.18.1)
 

data/app/assets/stylesheets/_bourbon.scss

@@ -25,6 +25,7 @@
 @import "functions/grid-width";
 @import "functions/modular-scale";
 @import "functions/px-to-em";
+@import "functions/px-to-rem";
 @import "functions/strip-units";
 @import "functions/tint-shade";
 @import "functions/transition-property-name";
@@ -66,11 +67,11 @@
 @import "addons/html5-input-types";
 @import "addons/position";
 @import "addons/prefixer";
-@import "addons/rem";
 @import "addons/retina-image";
 @import "addons/size";
 @import "addons/timing-functions";
 @import "addons/triangle";
+@import "addons/word-wrap";
 
 // Soon to be deprecated Mixins
 @import "bourbon-deprecated-upcoming";

data/app/assets/stylesheets/addons/_directional-values.scss

@@ -57,9 +57,6 @@
   $right:  $pre + "-right"  + if($suf, "-#{$suf}", "");
   $all:    $pre +             if($suf, "-#{$suf}", "");
 
-  // Get list inside $vals (is there a better way?)
-  @each $val in $vals { $vals: $val; }
-
   $vals: collapse-directionals($vals);
 
   @if contains-falsy($vals) {
@@ -94,21 +91,21 @@
 }
 
 @mixin margin($vals...) {
-  @include directional-property(margin, false, $vals);
+  @include directional-property(margin, false, $vals...);
 }
 
 @mixin padding($vals...) {
-  @include directional-property(padding, false, $vals);
+  @include directional-property(padding, false, $vals...);
 }
 
 @mixin border-style($vals...) {
-  @include directional-property(border, style, $vals);
+  @include directional-property(border, style, $vals...);
 }
 
 @mixin border-color($vals...) {
-  @include directional-property(border, color, $vals);
+  @include directional-property(border, color, $vals...);
 }
 
 @mixin border-width($vals...) {
-  @include directional-property(border, width, $vals);
+  @include directional-property(border, width, $vals...);
 }

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

@@ -6,14 +6,12 @@
   $height: nth($size, length($size));
 
   $foreground-color: nth($color, 1);
-  $background-color: transparent !default;
-  @if (length($color) == 2) {
-    $background-color: nth($color, 2);
-  }
+  $background-color: if(length($color) == 2, nth($color, 2), transparent);
 
   @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
 
     $width: $width / 2;
+    $height: if(length($size) > 1, $height, $height/2);
 
     @if $direction == up {
       border-left: $width solid $background-color;

data/app/assets/stylesheets/addons/_word-wrap.scss

@@ -0,0 +1,8 @@
+@mixin word-wrap($wrap: break-word) {
+  word-wrap: $wrap;
+
+  @if $wrap == break-word {
+    overflow-wrap: break-word;
+    word-break: break-all;
+  }
+}

data/app/assets/stylesheets/functions/_color-lightness.scss

@@ -3,11 +3,11 @@
 // More details here http://robots.thoughtbot.com/closer-look-color-lightness
 
 @function is-light($hex-color) {
-  $red: red(rgba($hex-color, 1.0));
-  $green: green(rgba($hex-color, 1.0));
-  $blue: blue(rgba($hex-color, 1.0));
+  $-local-red: red(rgba($hex-color, 1.0));
+  $-local-green: green(rgba($hex-color, 1.0));
+  $-local-blue: blue(rgba($hex-color, 1.0));
 
-  $lightness: ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
+  $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255;
 
-  @return $lightness > .6;
+  @return $-local-lightness > .6;
 }

data/app/assets/stylesheets/functions/_px-to-rem.scss

@@ -0,0 +1,15 @@
+// Convert pixels to rems
+// eg. for a relational value of 12px write rem(12)
+// Assumes $em-base is the font-size of <html>
+
+@function rem($pxval) {
+  @if not unitless($pxval) {
+      $pxval: strip-units($pxval);
+  }
+
+  $base: $em-base;
+  @if not unitless($base) {
+      $base: strip-units($base);
+  }
+  @return ($pxval / $base) * 1rem;
+}

data/app/assets/stylesheets/helpers/_is-num.scss

@@ -2,7 +2,7 @@
 // Helper for linear-gradient-parser
 //************************************************************************//
 @function _is-num($char) {
-  $strings: "0 1 2 3 4 5 6 7 8 9";
-  $index: str-index($strings, $char);
+  $values: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9;
+  $index: index($values, $char);
   @return if($index, true, false);
 }

data/bourbon.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.name        = "bourbon"
   s.version     = Bourbon::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Phil LaPier", "Chad Mazzola", "Matt Jankowski", "Nick Quaranto", "Jeremy Raines", "Mike Burns", "Andres Mejia", "Travis Haynes", "Chris Lloyd", "Gabe Berke-Williams", "J. Edward Dewyea", "Reda Lemeden"]
+  s.authors     = ["Phil LaPier", "Chad Mazzola", "Matt Jankowski", "Nick Quaranto", "Jeremy Raines", "Mike Burns", "Andres Mejia", "Travis Haynes", "Chris Lloyd", "Gabe Berke-Williams", "J. Edward Dewyea", "Reda Lemeden", "Kyle Fiedler"]
   s.email       = ["support@thoughtbot.com"]
   s.license     = 'MIT'
   s.homepage    = "https://github.com/thoughtbot/bourbon"

data/bower.json

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

data/dist/_bourbon.scss

@@ -25,6 +25,7 @@
 @import "functions/grid-width";
 @import "functions/modular-scale";
 @import "functions/px-to-em";
+@import "functions/px-to-rem";
 @import "functions/strip-units";
 @import "functions/tint-shade";
 @import "functions/transition-property-name";
@@ -66,11 +67,11 @@
 @import "addons/html5-input-types";
 @import "addons/position";
 @import "addons/prefixer";
-@import "addons/rem";
 @import "addons/retina-image";
 @import "addons/size";
 @import "addons/timing-functions";
 @import "addons/triangle";
+@import "addons/word-wrap";
 
 // Soon to be deprecated Mixins
 @import "bourbon-deprecated-upcoming";

data/dist/addons/_directional-values.scss

@@ -57,9 +57,6 @@
   $right:  $pre + "-right"  + if($suf, "-#{$suf}", "");
   $all:    $pre +             if($suf, "-#{$suf}", "");
 
-  // Get list inside $vals (is there a better way?)
-  @each $val in $vals { $vals: $val; }
-
   $vals: collapse-directionals($vals);
 
   @if contains-falsy($vals) {
@@ -94,21 +91,21 @@
 }
 
 @mixin margin($vals...) {
-  @include directional-property(margin, false, $vals);
+  @include directional-property(margin, false, $vals...);
 }
 
 @mixin padding($vals...) {
-  @include directional-property(padding, false, $vals);
+  @include directional-property(padding, false, $vals...);
 }
 
 @mixin border-style($vals...) {
-  @include directional-property(border, style, $vals);
+  @include directional-property(border, style, $vals...);
 }
 
 @mixin border-color($vals...) {
-  @include directional-property(border, color, $vals);
+  @include directional-property(border, color, $vals...);
 }
 
 @mixin border-width($vals...) {
-  @include directional-property(border, width, $vals);
+  @include directional-property(border, width, $vals...);
 }

data/dist/addons/_triangle.scss

@@ -6,14 +6,12 @@
   $height: nth($size, length($size));
 
   $foreground-color: nth($color, 1);
-  $background-color: transparent !default;
-  @if (length($color) == 2) {
-    $background-color: nth($color, 2);
-  }
+  $background-color: if(length($color) == 2, nth($color, 2), transparent);
 
   @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
 
     $width: $width / 2;
+    $height: if(length($size) > 1, $height, $height/2);
 
     @if $direction == up {
       border-left: $width solid $background-color;

data/dist/addons/_word-wrap.scss

@@ -0,0 +1,8 @@
+@mixin word-wrap($wrap: break-word) {
+  word-wrap: $wrap;
+
+  @if $wrap == break-word {
+    overflow-wrap: break-word;
+    word-break: break-all;
+  }
+}

data/dist/functions/_color-lightness.scss

@@ -3,11 +3,11 @@
 // More details here http://robots.thoughtbot.com/closer-look-color-lightness
 
 @function is-light($hex-color) {
-  $red: red(rgba($hex-color, 1.0));
-  $green: green(rgba($hex-color, 1.0));
-  $blue: blue(rgba($hex-color, 1.0));
+  $-local-red: red(rgba($hex-color, 1.0));
+  $-local-green: green(rgba($hex-color, 1.0));
+  $-local-blue: blue(rgba($hex-color, 1.0));
 
-  $lightness: ($red * 0.2126 + $green * 0.7152 + $blue * 0.0722) / 255;
+  $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255;
 
-  @return $lightness > .6;
+  @return $-local-lightness > .6;
 }

data/dist/functions/_px-to-rem.scss

@@ -0,0 +1,15 @@
+// Convert pixels to rems
+// eg. for a relational value of 12px write rem(12)
+// Assumes $em-base is the font-size of <html>
+
+@function rem($pxval) {
+  @if not unitless($pxval) {
+      $pxval: strip-units($pxval);
+  }
+
+  $base: $em-base;
+  @if not unitless($base) {
+      $base: strip-units($base);
+  }
+  @return ($pxval / $base) * 1rem;
+}

data/dist/helpers/_is-num.scss

@@ -2,7 +2,7 @@
 // Helper for linear-gradient-parser
 //************************************************************************//
 @function _is-num($char) {
-  $strings: "0 1 2 3 4 5 6 7 8 9";
-  $index: str-index($strings, $char);
+  $values: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9;
+  $index: index($values, $char);
   @return if($index, true, false);
 }

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "4.0.0.rc1"
+  VERSION = "4.0.0.rc2"
 end

data/package.json

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

data/readme.md

@@ -1,10 +1,12 @@
-[![Code Climate](https://codeclimate.com/github/thoughtbot/bourbon.png)](https://codeclimate.com/github/thoughtbot/bourbon)
-
 [![Bourbon Sass Mixin Library](http://bourbon.io/images/shared/bourbon-logo.png)](http://bourbon.io)
+<br>
+<br>
+[![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)
+
+## A lightweight mixin library for Sass
+Bourbon is a library of pure sass mixins that are designed to be simple
+and easy to use. No configuration required.
 
-# A simple and lightweight mixin library for Sass
-Bourbon is a comprehensive library of sass mixins that are designed to be simple
-and easy to use. No configuration required.  
 The mixins aim to be as vanilla as possible, meaning they should be as close to the original CSS syntax as possible.
 
 The mixins contain vendor specific prefixes for all CSS3 properties for support
@@ -82,6 +84,8 @@ Visit the [Command line tools wiki](https://github.com/thoughtbot/bourbon/wiki/C
 - [Changelog](https://github.com/thoughtbot/bourbon/wiki)
 - [Browser support](https://github.com/thoughtbot/bourbon/wiki/Browser-Support)
 
+### Chat with us
+[![Gitter chat](https://badges.gitter.im/thoughtbot/bourbon.png)](https://gitter.im/thoughtbot/bourbon)
 
 ### Credits
 ![thoughtbot](http://thoughtbot.com/images/tm/logo.png)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc1
+  version: 4.0.0.rc2
 platform: ruby
 authors:
 - Phil LaPier
@@ -16,65 +16,66 @@ authors:
 - Gabe Berke-Williams
 - J. Edward Dewyea
 - Reda Lemeden
+- Kyle Fiedler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-04-07 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: |
@@ -91,8 +92,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .npmignore
+- ".gitignore"
+- ".npmignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -108,11 +109,11 @@ files:
 - app/assets/stylesheets/addons/_html5-input-types.scss
 - app/assets/stylesheets/addons/_position.scss
 - app/assets/stylesheets/addons/_prefixer.scss
-- app/assets/stylesheets/addons/_rem.scss
 - app/assets/stylesheets/addons/_retina-image.scss
 - app/assets/stylesheets/addons/_size.scss
 - app/assets/stylesheets/addons/_timing-functions.scss
 - app/assets/stylesheets/addons/_triangle.scss
+- app/assets/stylesheets/addons/_word-wrap.scss
 - app/assets/stylesheets/css3/_animation.scss
 - app/assets/stylesheets/css3/_appearance.scss
 - app/assets/stylesheets/css3/_backface-visibility.scss
@@ -145,6 +146,7 @@ files:
 - app/assets/stylesheets/functions/_grid-width.scss
 - app/assets/stylesheets/functions/_modular-scale.scss
 - app/assets/stylesheets/functions/_px-to-em.scss
+- app/assets/stylesheets/functions/_px-to-rem.scss
 - app/assets/stylesheets/functions/_strip-units.scss
 - app/assets/stylesheets/functions/_tint-shade.scss
 - app/assets/stylesheets/functions/_transition-property-name.scss
@@ -178,11 +180,11 @@ files:
 - dist/addons/_html5-input-types.scss
 - dist/addons/_position.scss
 - dist/addons/_prefixer.scss
-- dist/addons/_rem.scss
 - dist/addons/_retina-image.scss
 - dist/addons/_size.scss
 - dist/addons/_timing-functions.scss
 - dist/addons/_triangle.scss
+- dist/addons/_word-wrap.scss
 - dist/css3/_animation.scss
 - dist/css3/_appearance.scss
 - dist/css3/_backface-visibility.scss
@@ -215,6 +217,7 @@ files:
 - dist/functions/_grid-width.scss
 - dist/functions/_modular-scale.scss
 - dist/functions/_px-to-em.scss
+- dist/functions/_px-to-rem.scss
 - dist/functions/_strip-units.scss
 - dist/functions/_tint-shade.scss
 - dist/functions/_transition-property-name.scss
@@ -257,17 +260,17 @@ 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: 1.3.1
 requirements: []
 rubyforge_project: bourbon
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Bourbon Sass Mixins using SCSS syntax.

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

@@ -1,33 +0,0 @@
-@mixin rem($property, $size, $base: $em-base) {
-  @if not unitless($base) {
-    $base: strip-units($base);
-  }
-
-  $unitless_values: ();
-  @each $num in $size {
-    @if not unitless($num) {
-      @if unit($num) == "em" {
-        $num: $num * $base;
-      }
-
-      $num: strip-units($num);
-    }
-
-    $unitless_values: append($unitless_values, $num);
-  }
-  $size: $unitless_values;
-
-  $pixel_values: ();
-  $rem_values: ();
-  @each $value in $size {
-    $pixel_value: $value * 1px;
-    $pixel_values: append($pixel_values, $pixel_value);
-
-    $rem_value: ($value / $base) * 1rem;
-    $rem_values: append($rem_values, $rem_value);
-  }
-
-  #{$property}: $pixel_values;
-  #{$property}: $rem_values;
-}
-

data/dist/addons/_rem.scss

@@ -1,33 +0,0 @@
-@mixin rem($property, $size, $base: $em-base) {
-  @if not unitless($base) {
-    $base: strip-units($base);
-  }
-
-  $unitless_values: ();
-  @each $num in $size {
-    @if not unitless($num) {
-      @if unit($num) == "em" {
-        $num: $num * $base;
-      }
-
-      $num: strip-units($num);
-    }
-
-    $unitless_values: append($unitless_values, $num);
-  }
-  $size: $unitless_values;
-
-  $pixel_values: ();
-  $rem_values: ();
-  @each $value in $size {
-    $pixel_value: $value * 1px;
-    $pixel_values: append($pixel_values, $pixel_value);
-
-    $rem_value: ($value / $base) * 1rem;
-    $rem_values: append($rem_values, $rem_value);
-  }
-
-  #{$property}: $pixel_values;
-  #{$property}: $rem_values;
-}
-