bourbon 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 151abcb53a0cd21cfa4337132151d9e39b2abd61
-  data.tar.gz: f20c75d60c7574ae94d42f8b7af3dedf8b92ef73
+  metadata.gz: 761ff8c4792ae71d9a87918e2663683824f10b2c
+  data.tar.gz: 00d5c800159752637caabc5c06a8f89d1c848e8f
 SHA512:
-  metadata.gz: 793090861adf2e65b284beea77e1757083d95be8225c02da774faa4317c4ffce2bd4989377971f2f1234268ff212d600023e1e5c6c092ce953ef854e1e587ea3
-  data.tar.gz: dc086af8fabb7a568fc590a10a00f8eab3f863ab6156b24fbe30090dbe9079bbce7abb203ebf979f907ac756adbef9888b2cb87c9e58af6c1d5ed0807994acb8
+  metadata.gz: 62cb326069ad6f8f7a93995e487504b1b06b0d67a9682657e1f86225e4e15d7228d8534376b8ff3f7eee4c9f8a2f70fe954689811ecb9156df9cb4f66a187461
+  data.tar.gz: a41e3ae3d95229e8333d6ddca2675c07e430e5f7dfec344a594a943b02f524dba7a7f37137f2aa00d1e0078d7d634b5f4d49b585f13821168a6282c54ee9a60c

data/.hound.yml

@@ -1,4 +1,5 @@
 ruby:
   enabled: true
 scss:
+  config_file: .scss-lint.yml
   enabled: true

data/.npmignore

@@ -1,5 +1,6 @@
 .gitignore
 .hound.yml
+.sass-cache
 _site
 bin/
 bourbon.gemspec

data/.scss-lint.yml

@@ -1,175 +1,14 @@
 scss_files: "app/assets/stylesheets/**/*.scss"
-
 linters:
-  BangFormat:
-    enabled: true
-    space_before_bang: true
-    space_after_bang: false
-
   BorderZero:
     enabled: false
-
-  ColorKeyword:
-    enabled: true
-    severity: warning
-
-  Comment:
-    enabled: true
-
-  DebugStatement:
-    enabled: true
-
-  DeclarationOrder:
-    enabled: true
-
-  DuplicateProperty:
-    enabled: true
-
-  ElsePlacement:
-    enabled: true
-    style: same_line
-
-  EmptyLineBetweenBlocks:
-    enabled: true
-    ignore_single_line_blocks: true
-
-  EmptyRule:
-    enabled: true
-
-  FinalNewline:
-    enabled: true
-    present: true
-
-  HexLength:
+  ColorVariable:
     enabled: false
-    style: short
-
-  HexNotation:
-    enabled: true
-    style: lowercase
-
-  HexValidation:
-    enabled: true
-
-  IdWithExtraneousSelector:
-    enabled: true
-
-  ImportPath:
-    enabled: true
-    leading_underscore: false
-    filename_extension: false
-
-  Indentation:
-    enabled: true
-    character: space
-    width: 2
-
   LeadingZero:
     enabled: true
     style: include_zero
-
-  MergeableSelector:
-    enabled: true
-    force_nesting: true
-
-  NameFormat:
-    enabled: true
-    convention: hyphenated_lowercase
-
-  NestingDepth:
-    enabled: true
-    max_depth: 4
-    severity: warning
-
-  PlaceholderInExtend:
-    enabled: false
-
-  PropertySortOrder:
-    enabled: true
-    ignore_unspecified: false
-    severity: warning
-
-  PropertySpelling:
-    enabled: true
-    extra_properties: []
-
-  QualifyingElement:
-    enabled: true
-    allow_with_attribute: false
-    allow_with_class: false
-    allow_with_id: false
-    severity: warning
-
-  SelectorDepth:
-    enabled: true
-    max_depth: 2
-    severity: warning
-
   SelectorFormat:
-    enabled: true
-    convention: hyphenated_lowercase
-
-  Shorthand:
-    enabled: true
-    severity: warning
-
-  SingleLinePerProperty:
-    enabled: true
-    allow_single_line_rule_sets: true
-
-  SingleLinePerSelector:
-    enabled: true
-
-  SpaceAfterComma:
-    enabled: true
-
-  SpaceAfterPropertyColon:
-    enabled: true
-    style: one_space
-
-  SpaceAfterPropertyName:
-    enabled: true
-
-  SpaceBeforeBrace:
-    enabled: true
-    style: space
-    allow_single_line_padding: false
-
-  SpaceBetweenParens:
-    enabled: true
-    spaces: 0
-
+    enabled: false
   StringQuotes:
     enabled: true
     style: double_quotes
-
-  TrailingSemicolon:
-    enabled: true
-
-  TrailingZero:
-    enabled: false
-
-  UnnecessaryMantissa:
-    enabled: true
-
-  UnnecessaryParentReference:
-    enabled: true
-
-  UrlFormat:
-    enabled: true
-
-  UrlQuotes:
-    enabled: true
-
-  VendorPrefixes:
-    enabled: true
-    identifier_list: bourbon
-    include: []
-    exclude: []
-
-  ZeroUnit:
-    enabled: true
-    severity: warning
-
-  Compass::*:
-    enabled: false

data/.travis.yml

@@ -0,0 +1,7 @@
+branches:
+  except:
+    - gh-pages
+language: ruby
+notifications:
+  email: false
+rvm: 2.2.1

data/README.md

@@ -15,6 +15,9 @@ The mixins contain vendor specific prefixes for all CSS3 properties for support
 - **[Changelog](https://github.com/thoughtbot/bourbon/releases)**
 - **[Issues & Bugs](https://github.com/thoughtbot/bourbon/issues)**
 
+Follow the [@bourbonsass](https://twitter.com/bourbonsass) Twitter account
+for updates.
+
 ## Requirements
 
 - [Sass](https://github.com/sass/sass) 3.4+ or [LibSass](https://github.com/sass/libsass) 3.1+
@@ -116,12 +119,22 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
 
 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
+## License
 
-[![thoughtbot](http://images.thoughtbot.com/bourbon/thoughtbot-logo.svg)](http://thoughtbot.com)
+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).
 
-Bourbon is maintained and funded by [thoughtbot, inc](http://thoughtbot.com). Tweet your questions or suggestions to [@bourbonsass](https://twitter.com/bourbonsass) and while you’re at it follow us too.
+## About thoughtbot
 
-## License
+[![thoughtbot](http://thoughtbot.github.io/images/signature.svg)][hire]
+
+Bourbon is maintained and funded by thoughtbot, inc.
+The names and logos for thoughtbot are trademarks of thoughtbot, inc.
+
+We love open source software!
+See [our other projects][community] or
+[hire us][hire] to design, develop, and grow your product.
 
-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).
+[community]: https://thoughtbot.com/community?utm_source=github
+[hire]: https://thoughtbot.com/hire-us?utm_source=github

data/app/assets/stylesheets/_bourbon.scss

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

data/app/assets/stylesheets/css3/_flex-box.scss

@@ -114,7 +114,7 @@
   // Alt values.
   $value-2009: $value;
   $value-2011: $value;
-  $direction: "normal";
+  $direction: normal;
 
   @if $value == row {
     $value-2009: horizontal;
@@ -130,9 +130,7 @@
 
   // 2009
   @include prefixer(box-orient, $value-2009, webkit moz spec);
-  @if $direction == "reverse" {
-    @include prefixer(box-direction, $direction, webkit moz spec);
-  }
+  @include prefixer(box-direction, $direction, webkit moz spec);
 
   // 2012
   @include prefixer(flex-direction, $value, webkit moz spec);

data/app/assets/stylesheets/helpers/_convert-units.scss

@@ -3,13 +3,19 @@
 // Source: http://sassmeister.com/gist/9647408
 //************************************************************************//
 @function _convert-units($number, $unit) {
-  $strings: "px" "cm" "mm" "%" "ch" "pica" "in" "em" "rem" "pt" "pc" "ex" "vw" "vh" "vmin" "vmax", "deg", "rad", "grad", "turn";
-  $units:   1px  1cm  1mm  1%  1ch  1pica  1in  1em  1rem  1pt  1pc  1ex  1vw  1vh  1vmin  1vmax, 1deg, 1rad, 1grad, 1turn;
+  $strings: "px", "cm", "mm", "%", "ch", "pica", "in", "em", "rem", "pt", "pc", "ex", "vw", "vh", "vmin", "vmax", "deg", "rad", "grad", "turn";
+  $units:   1px, 1cm, 1mm, 1%, 1ch, 1pica, 1in, 1em, 1rem, 1pt, 1pc, 1ex, 1vw, 1vh, 1vmin, 1vmax, 1deg, 1rad, 1grad, 1turn;
   $index: index($strings, $unit);
 
   @if not $index {
     @warn "Unknown unit `#{$unit}`.";
     @return false;
   }
+
+  @if type-of($number) != "number" {
+    @warn "`#{$number} is not a number`";
+    @return false;
+  }
+
   @return $number * nth($units, $index);
 }

data/bower.json

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

data/features/step_definitions/bourbon_steps.rb

@@ -20,5 +20,5 @@ Then /^bourbon should not have been generated$/ do
 end
 
 Then /^the output should contain the current version of Bourbon$/ do
-  step %(the output should contain exactly "Bourbon #{Bourbon::VERSION}\n")
+  assert_exact_output("Bourbon #{Bourbon::VERSION}\n", all_output)
 end

data/lib/bourbon/version.rb

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

data/package.json

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

data/spec/bourbon/addons/border_color_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe "border-color" do
+  before(:all) do
+    ParserSupport.parse_file("addons/border-color")
+  end
+
+  context "called with one color" do
+    it "applies same color to all sides" do
+      rule = "border-color: #ff0000"
+
+      expect(".border-color-all").to have_rule(rule)
+    end
+  end
+
+  context "called with two colors" do
+    it "applies to alternating sides" do
+      rule = "border-color: #00ff00 #0000ff"
+
+      expect(".border-color-alternate").to have_rule(rule)
+    end
+  end
+
+  context "called with three colors" do
+    it "applies second color to left and right" do
+      rule = "border-color: #ff0000 #00ff00 #0000ff"
+
+      expect(".border-color-implied-left").to have_rule(rule)
+    end
+  end
+
+  context "called with four colors" do
+    it "applies different colors to all sides" do
+      rule = "border-color: #0000ff #00ff00 #ff0000 #ffff00"
+
+      expect(".border-color-explicit").to have_rule(rule)
+    end
+  end
+
+  context "called with null values" do
+    it "writes rules for other three" do
+      ruleset = "border-top-color: #00ff00; " +
+                "border-right-color: #ffff00; " +
+                "border-left-color: #0000ff;"
+      bad_rule = "border-bottom-color: null;"
+
+      expect(".border-color-false-third").to have_ruleset(ruleset)
+      expect(".border-color-false-third").to_not have_rule(bad_rule)
+    end
+  end
+end

data/spec/bourbon/addons/border_radius_spec.rb

@@ -0,0 +1,25 @@
+require "spec_helper"
+
+describe "border-radius" do
+  before(:all) do
+    ParserSupport.parse_file("addons/border-radius")
+  end
+
+  context "called with one argument" do
+    it "applies to correct sides" do
+      top = "border-top-left-radius: 1em; " +
+            "border-top-right-radius: 1em;"
+      left = "border-bottom-left-radius: 2em; " +
+              "border-top-left-radius: 2em;"
+      right = "border-bottom-right-radius: 3em; " +
+              "border-top-right-radius: 3em;"
+      bottom = "border-bottom-left-radius: 4em; " +
+                "border-bottom-right-radius: 4em;"
+
+      expect(".border-top-radius").to have_ruleset(top)
+      expect(".border-left-radius").to have_ruleset(left)
+      expect(".border-right-radius").to have_ruleset(right)
+      expect(".border-bottom-radius").to have_ruleset(bottom)
+    end
+  end
+end

data/spec/bourbon/addons/border_style_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe "border-style" do
+  before(:all) do
+    ParserSupport.parse_file("addons/border-style")
+  end
+
+  context "called with one style" do
+    it "applies same style to all sides" do
+      rule = "border-style: solid"
+
+      expect(".border-style-all").to have_rule(rule)
+    end
+  end
+
+  context "called with two styles" do
+    it "applies to alternating sides" do
+      rule = "border-style: dotted dashed"
+
+      expect(".border-style-alternate").to have_rule(rule)
+    end
+  end
+
+  context "called with three styles" do
+    it "applies second style to left and right" do
+      rule = "border-style: dashed double solid"
+
+      expect(".border-style-implied-left").to have_rule(rule)
+    end
+  end
+
+  context "called with four styles" do
+    it "applies different styles to all sides" do
+      rule = "border-style: dotted groove ridge none"
+
+      expect(".border-style-explicit").to have_rule(rule)
+    end
+  end
+
+  context "called with null values" do
+    it "writes rules for other three" do
+      ruleset = "border-top-style: inset; " +
+                "border-right-style: none; " +
+                "border-left-style: double;"
+      bad_rule = "border-bottom-style: null;"
+
+      expect(".border-style-false-third").to have_ruleset(ruleset)
+      expect(".border-style-false-third").to_not have_rule(bad_rule)
+    end
+  end
+end