bourbon 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76090e47758709f2a3e2483e901ab9e6c614817a
-  data.tar.gz: 03f68bbb75d7e22dc964943d774cd4505888e4bd
+  metadata.gz: 151abcb53a0cd21cfa4337132151d9e39b2abd61
+  data.tar.gz: f20c75d60c7574ae94d42f8b7af3dedf8b92ef73
 SHA512:
-  metadata.gz: 9a59ba6943ed2a35d9da1eb244665905dc051e16021deae8e49ffb71658028c77f88006a4cc261b8e25c8b03349c8a4233caf0c8b0957c66b27bff53a617286b
-  data.tar.gz: b3d2ab69fc10311f5a097c29ed11da3de85f6013fe5d4de9621e03254e234df8fb8f1b4b39b936a30f2e87c65cc6f4e3bbd656dc4974feb854c52c5551707ba9
+  metadata.gz: 793090861adf2e65b284beea77e1757083d95be8225c02da774faa4317c4ffce2bd4989377971f2f1234268ff212d600023e1e5c6c092ce953ef854e1e587ea3
+  data.tar.gz: dc086af8fabb7a568fc590a10a00f8eab3f863ab6156b24fbe30090dbe9079bbce7abb203ebf979f907ac756adbef9888b2cb87c9e58af6c1d5ed0807994acb8

data/.npmignore

@@ -1,7 +1,6 @@
 .gitignore
 .hound.yml
 _site
-app/
 bin/
 bourbon.gemspec
 bower.json

data/app/assets/stylesheets/_bourbon.scss

@@ -1,4 +1,4 @@
-// Bourbon 4.2.0
+// Bourbon 4.2.1
 // http://bourbon.io
 // Copyright 2011-2015 thoughtbot, inc.
 // MIT License

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

@@ -1,8 +1,7 @@
 @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}");
-  }
-  @else {
+  } @else {
     background-image:       url("#{$filename}.#{$extension}");
   }
 
@@ -10,22 +9,17 @@
     @if $asset-pipeline {
       @if $retina-filename {
         background-image: image-url("#{$retina-filename}.#{$extension}");
-      }
-      @else {
+      } @else {
         background-image: image-url("#{$filename}#{$retina-suffix}.#{$extension}");
       }
-    }
-
-    @else {
+    } @else {
       @if $retina-filename {
         background-image: url("#{$retina-filename}.#{$extension}");
-      }
-      @else {
+      } @else {
         background-image: url("#{$filename}#{$retina-suffix}.#{$extension}");
       }
     }
 
     background-size: $background-size;
-
   }
 }

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

@@ -39,17 +39,13 @@
 
   @if is-size($height) {
     height: $height;
-  }
-
-  @else {
+  } @else {
     @warn "`#{$height}` is not a valid length for the `$height` parameter in the `size` mixin.";
   }
 
   @if is-size($width) {
     width: $width;
-  }
-
-  @else {
+  } @else {
     @warn "`#{$width}` is not a valid length for the `$width` parameter in the `size` mixin.";
   }
 }

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

@@ -1,15 +1,12 @@
-@mixin triangle ($size, $color, $direction) {
-  height: 0;
-  width: 0;
-
+@mixin triangle($size, $color, $direction) {
   $width: nth($size, 1);
   $height: nth($size, length($size));
-
   $foreground-color: nth($color, 1);
   $background-color: if(length($color) == 2, nth($color, 2), transparent);
+  height: 0;
+  width: 0;
 
   @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
-
     $width: $width / 2;
     $height: if(length($size) > 1, $height, $height/2);
 
@@ -17,65 +14,48 @@
       border-bottom: $height solid $foreground-color;
       border-left: $width solid $background-color;
       border-right: $width solid $background-color;
-
     } @else if $direction == right {
       border-bottom: $width solid $background-color;
       border-left: $height solid $foreground-color;
       border-top: $width solid $background-color;
-
     } @else if $direction == down {
       border-left: $width solid $background-color;
       border-right: $width solid $background-color;
       border-top: $height solid $foreground-color;
-
     } @else if $direction == left {
       border-bottom: $width solid $background-color;
       border-right: $height solid $foreground-color;
       border-top: $width solid $background-color;
     }
-  }
-
-  @else if ($direction == up-right) or ($direction == up-left) {
+  } @else if ($direction == up-right) or ($direction == up-left) {
     border-top: $height solid $foreground-color;
 
     @if $direction == up-right {
       border-left:  $width solid $background-color;
-
     } @else if $direction == up-left {
       border-right: $width solid $background-color;
     }
-  }
-
-  @else if ($direction == down-right) or ($direction == down-left) {
+  } @else if ($direction == down-right) or ($direction == down-left) {
     border-bottom: $height solid $foreground-color;
 
     @if $direction == down-right {
       border-left:  $width solid $background-color;
-
     } @else if $direction == down-left {
       border-right: $width solid $background-color;
     }
-  }
-
-  @else if ($direction == inset-up) {
+  } @else if ($direction == inset-up) {
     border-color: $background-color $background-color $foreground-color;
     border-style: solid;
     border-width: $height $width;
-  }
-
-  @else if ($direction == inset-down) {
+  } @else if ($direction == inset-down) {
     border-color: $foreground-color $background-color $background-color;
     border-style: solid;
     border-width: $height $width;
-  }
-
-  @else if ($direction == inset-right) {
+  } @else if ($direction == inset-right) {
     border-color: $background-color $background-color $background-color $foreground-color;
     border-style: solid;
     border-width: $width $height;
-  }
-
-  @else if ($direction == inset-left) {
+  } @else if ($direction == inset-left) {
     border-color: $background-color $foreground-color $background-color $background-color;
     border-style: solid;
     border-width: $width $height;

data/app/assets/stylesheets/functions/_is-length.scss

@@ -5,7 +5,7 @@
 /// @param {String} $value
 
 @function is-length($value) {
-  @return type-of($value) != "null" and (str-slice($value + "", 1, 4) == 'calc'
+  @return type-of($value) != "null" and (str-slice($value + "", 1, 4) == "calc"
        or index(auto inherit initial 0, $value)
        or (type-of($value) == "number" and not(unitless($value))));
 }

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

@@ -4,8 +4,7 @@
 @function font-url-prefixer($asset-pipeline) {
   @if $asset-pipeline == true {
     @return font-url;
-  }
-  @else {
+  } @else {
     @return url;
   }
 }

data/bower.json

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

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "4.2.0"
+  VERSION = "4.2.1"
 end

data/package.json

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

data/spec/bourbon/functions/px_to_rem_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe "px-to-rem" do
+  before(:all) do
+    ParserSupport.parse_file("functions/px-to-rem")
+  end
+
+  context "called with unitless integer" do
+    it "outputs rems" do
+      expect(".unitless").to have_rule("font-size: 0.75rem")
+    end
+  end
+
+  context "called with px" do
+    it "outputs rems" do
+      expect(".px").to have_rule("font-size: 1rem")
+    end
+  end
+
+  context "called with px with modified base" do
+    it "outputs rems" do
+      expect(".px-with-modified-base").to have_rule("font-size: 1rem")
+    end
+  end
+end

data/spec/bourbon/functions/shade_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "shade" do
+  before(:all) do
+    ParserSupport.parse_file("functions/shade")
+  end
+
+  context "called on white" do
+    it "shades white" do
+      expect(".shade-white").to have_rule("color: #3f3f3f")
+    end
+  end
+
+  context "called on black" do
+    it "still returns black" do
+      expect(".shade-black").to have_rule("color: black")
+    end
+  end
+
+  context "called on red" do
+    it "shades red" do
+      expect(".shade-red").to have_rule("color: #bf0000")
+    end
+  end
+
+  context "called on gray" do
+    it "shades gray" do
+      expect(".shade-gray").to have_rule("color: #161616")
+    end
+  end
+end

data/spec/bourbon/functions/strip_units_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "strip-units" do
+  before(:all) do
+    ParserSupport.parse_file("functions/strip-units")
+  end
+
+  context "called with px" do
+    it "strips units" do
+      expect(".px").to have_rule("width: 10")
+    end
+  end
+
+  context "called with em" do
+    it "strips units" do
+      expect(".em").to have_rule("width: 2")
+    end
+  end
+
+  context "called with rem" do
+    it "strips units" do
+      expect(".rem").to have_rule("width: 1.5")
+    end
+  end
+
+  context "called with percent" do
+    it "strips units" do
+      expect(".percent").to have_rule("width: 20")
+    end
+  end
+end

data/spec/bourbon/functions/tint_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "tint" do
+  before(:all) do
+    ParserSupport.parse_file("functions/tint")
+  end
+
+  context "called on white" do
+    it "still returns white" do
+      expect(".tint-white").to have_rule("color: white")
+    end
+  end
+
+  context "called on black" do
+    it "tints black" do
+      expect(".tint-black").to have_rule("color: #7f7f7f")
+    end
+  end
+
+  context "called on red" do
+    it "tints red" do
+      expect(".tint-red").to have_rule("color: #ff3f3f")
+    end
+  end
+
+  context "called on gray" do
+    it "tints gray" do
+      expect(".tint-gray").to have_rule("color: #c6c6c6")
+    end
+  end
+end

data/spec/bourbon/functions/unpack_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe "unpack" do
+  before(:all) do
+    ParserSupport.parse_file("functions/unpack")
+  end
+
+  context "single" do
+    it "unpacks four identical measurements" do
+      expect(".single").to have_rule("padding: 10px 10px 10px 10px")
+    end
+  end
+
+  context "double" do
+    it "unpacks identical measurements for top and bottom,
+      and different identical measurements for left and right" do
+      expect(".double").to have_rule("padding: 1em 2em 1em 2em")
+    end
+  end
+
+  context "triple" do
+    it "unpacks identical measurements for left and right" do
+      expect(".triple").to have_rule("padding: 10px 20px 0 20px")
+    end
+  end
+
+  context "quadruple" do
+    it "unpacks four distict measurements" do
+      expect(".quadruple").to have_rule("padding: 0 calc(1em + 10px) 20px 50px")
+    end
+  end
+end

data/spec/bourbon/helpers/convert_units_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe "convert-units" do
+  before(:all) do
+    ParserSupport.parse_file("helpers/convert-units")
+  end
+
+  context "called with integer and px" do
+    it "is converted to px length" do
+      expect(".px").to have_rule("height: 12px")
+    end
+  end
+
+  context "called with integer and pt" do
+    it "is converted to points" do
+      expect(".pt").to have_rule("font-size: 16pt")
+    end
+  end
+
+  context "called with integer and deg" do
+    it "is converted to degrees" do
+      expect(".deg").to have_rule("transform: rotate(180deg)")
+    end
+  end
+
+  context "called with string and px" do
+    it "returns false" do
+      expect(".string").to have_rule("padding-top: false")
+    end
+  end
+end

data/spec/fixtures/functions/px-to-rem.scss

@@ -0,0 +1,15 @@
+@import "setup";
+
+.unitless {
+  font-size: rem(12);
+}
+
+.px {
+  font-size: rem(16px);
+}
+
+$em-base: 20px;
+
+.px-with-modified-base {
+  font-size: rem(20);
+}

data/spec/fixtures/functions/shade.scss

@@ -0,0 +1,17 @@
+@import "setup";
+
+.shade-white {
+  color: shade(#ffffff, 75%);
+}
+
+.shade-black {
+  color: shade(#000, 50%);
+}
+
+.shade-red {
+  color: shade(#ff0000, 25%);
+}
+
+.shade-gray {
+  color: shade(#222222, 33%);
+}

data/spec/fixtures/functions/strip-units.scss

@@ -0,0 +1,17 @@
+@import "setup";
+
+.px {
+  width: strip-units(10px);
+}
+
+.em {
+  width: strip-units(2em);
+}
+
+.rem {
+  width: strip-units(1.5rem);
+}
+
+.percent {
+  width: strip-units(20%);
+}

data/spec/fixtures/functions/tint.scss

@@ -0,0 +1,17 @@
+@import "setup";
+
+.tint-white {
+  color: tint(#ffffff, 75%);
+}
+
+.tint-black {
+  color: tint(#000, 50%);
+}
+
+.tint-red {
+  color: tint(#ff0000, 25%);
+}
+
+.tint-gray {
+  color: tint(#aaaaaa, 33%);
+}

data/spec/fixtures/functions/unpack.scss

@@ -0,0 +1,17 @@
+@import "setup";
+
+.single {
+  padding: unpack(10px);
+}
+
+.double {
+  padding: unpack(1em 2em);
+}
+
+.triple {
+  padding: unpack(10px 20px 0);
+}
+
+.quadruple {
+  padding: unpack(0 calc(1em + 10px) 20px 50px);
+}

data/spec/fixtures/helpers/convert-units.scss

@@ -0,0 +1,17 @@
+@import "setup";
+
+.px {
+  height: convert-units(10, "px");
+}
+
+.pt {
+  font-size: convert-units(16, "pt");
+}
+
+.deg {
+  transform: rotate(convert-units(180, "deg"));
+}
+
+.string {
+  padding-top: convert-units("stringy", "px");
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bourbon
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Andres Mejia
@@ -22,7 +22,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -229,6 +229,12 @@ files:
 - spec/bourbon/functions/is_size_spec.rb
 - spec/bourbon/functions/modular_scale_spec.rb
 - spec/bourbon/functions/px_to_em_spec.rb
+- spec/bourbon/functions/px_to_rem_spec.rb
+- spec/bourbon/functions/shade_spec.rb
+- spec/bourbon/functions/strip_units_spec.rb
+- spec/bourbon/functions/tint_spec.rb
+- spec/bourbon/functions/unpack_spec.rb
+- spec/bourbon/helpers/convert_units_spec.rb
 - spec/fixtures/_setup.scss
 - spec/fixtures/functions/assign-inputs.scss
 - spec/fixtures/functions/contains.scss
@@ -238,6 +244,12 @@ files:
 - spec/fixtures/functions/is-size.scss
 - spec/fixtures/functions/modular-scale.scss
 - spec/fixtures/functions/px-to-em.scss
+- spec/fixtures/functions/px-to-rem.scss
+- spec/fixtures/functions/shade.scss
+- spec/fixtures/functions/strip-units.scss
+- spec/fixtures/functions/tint.scss
+- spec/fixtures/functions/unpack.scss
+- spec/fixtures/helpers/convert-units.scss
 - spec/spec_helper.rb
 - spec/support/matchers/be_contained_in.rb
 - spec/support/matchers/have_rule.rb
@@ -283,6 +295,12 @@ test_files:
 - spec/bourbon/functions/is_size_spec.rb
 - spec/bourbon/functions/modular_scale_spec.rb
 - spec/bourbon/functions/px_to_em_spec.rb
+- spec/bourbon/functions/px_to_rem_spec.rb
+- spec/bourbon/functions/shade_spec.rb
+- spec/bourbon/functions/strip_units_spec.rb
+- spec/bourbon/functions/tint_spec.rb
+- spec/bourbon/functions/unpack_spec.rb
+- spec/bourbon/helpers/convert_units_spec.rb
 - spec/fixtures/_setup.scss
 - spec/fixtures/functions/assign-inputs.scss
 - spec/fixtures/functions/contains.scss
@@ -292,6 +310,12 @@ test_files:
 - spec/fixtures/functions/is-size.scss
 - spec/fixtures/functions/modular-scale.scss
 - spec/fixtures/functions/px-to-em.scss
+- spec/fixtures/functions/px-to-rem.scss
+- spec/fixtures/functions/shade.scss
+- spec/fixtures/functions/strip-units.scss
+- spec/fixtures/functions/tint.scss
+- spec/fixtures/functions/unpack.scss
+- spec/fixtures/helpers/convert-units.scss
 - spec/spec_helper.rb
 - spec/support/matchers/be_contained_in.rb
 - spec/support/matchers/have_rule.rb