bourbon 5.0.0.beta.1 → 5.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0049bb742840704492f57b929d7c3df6d547b688
-  data.tar.gz: df186a0c88d922d31829d0ebc24eb3e137c2908f
+  metadata.gz: e66aa96c86f786e36d15ae2b4653a8040465e92d
+  data.tar.gz: 7a54474eed24abc0b0a9b5339154d0b53be06506
 SHA512:
-  metadata.gz: c0068eb60a455c7bd834902663c044b91df1042717f11c1db054588304c3ac8379ae314a0c8ea8cc10a4c347308d5647fd0fa254a2a0ac6d52c4ca674995ce8d
-  data.tar.gz: ddfad619c7ca124897b4bed3e8d8ef86cd830b44bb8101dc268af8d58a68291c1be5413957a92eb8cd1b62cb744f8cd10e217726fa113eb5b4838a2643583808
+  metadata.gz: e02f2f45a76e60896c8471ec7a91c5c077aedfd2b75bc9aace42ee8031af89fae96b12bea394969fd884d69873bded2686c4c0315d3b756fda05970f1bec2fe8
+  data.tar.gz: e7a04a31131884169181e968bcc0a50b1c779b27f04e61a0225636038accdd066854ccd615bf46a4d2bb0b642f2dd0e02a86277297ceb0156f993b9fd244b193

data/.scss-lint.yml

@@ -107,6 +107,10 @@ linters:
   PlaceholderInExtend:
     enabled: true
 
+  PrivateNamingConvention:
+    enabled: false
+    prefix: _
+
   PropertyCount:
     enabled: false
 
@@ -174,6 +178,10 @@ linters:
   SpaceAfterPropertyName:
     enabled: true
 
+  SpaceAfterVariableColon:
+    enabled: true
+    style: at_least_one_space
+
   SpaceAfterVariableName:
     enabled: true
 

data/NEWS.md

@@ -3,7 +3,27 @@
 The noteworthy changes for each Bourbon version are included here. For a
 complete changelog, see the Git history for each version via the version links.
 
-## `master`
+## [5.0.0-beta.2] - March 3, 2016
+
+### Added
+
+- Added global settings for the `contrast-switch` mixin:
+  `contrast-switch-dark-color` & `contrast-switch-light-color`.
+
+### Changed
+
+- Swapped argument names `contrast-switch`; what was `$dark-color` is now
+  `$light-color` and what was `$light-color` is now `$dark-color`.
+
+### Removed
+
+- Dropped support for Ruby on Rails versions older than 4.2.
+- Dropped support for LibSass versions older than 3.3.
+- The `is-light` function is now private.
+
+[5.0.0-beta.2]: https://github.com/thoughtbot/bourbon/compare/v5.0.0.beta.1...v5.0.0.beta.2
+
+## [5.0.0-beta.1] - February 9, 2016
 
 ### Added
 
@@ -30,13 +50,14 @@ complete changelog, see the Git history for each version via the version links.
   See [4e43c2d].
 - The `clearfix` mixin now uses `block` display, instead of `table`.
 
-### Deprecated
+### Removed
 
 - The `$weight` and `$style` arguments in the `font-face` mixin have been
-  deprecated. Instead, you can now include these—along with other CSS
+  removed. Instead, you can now include these—along with other CSS
   properties—within the mixin block and they’ll be output as part of the
   `@font-face` declaration.
 
+[5.0.0-beta.1]: https://github.com/thoughtbot/bourbon/compare/da4451e...v5.0.0.beta.1
 [2356719]: https://github.com/thoughtbot/bourbon/commit/235671948ef3a9c343c4391d250082a0373c8d83
 [4e43c2d]: https://github.com/thoughtbot/bourbon/commit/4e43c2d7507999b539771bdc1b3733b18b3c1883
 
@@ -56,16 +77,17 @@ complete changelog, see the Git history for each version via the version links.
 - The `size` mixin now requires a comma-separated argument list,
   e.g. `@include size(1em, 2em);`.
 
-### Deprecated
+### Removed
 
-- All vendor prefixing mixins have been deprecated. We recommend using a more
+- All vendor prefixing mixins have been removed. We recommend using a more
   robust and maintainable solution
   like [Autoprefixer](https://github.com/postcss/autoprefixer).
-- The `$global-prefixes` setting has been deprecated and the `prefixer` mixin
+- The `$global-prefixes` setting has been removed and the `prefixer` mixin
   has been refactored and no longer uses it.
-- The `em` and `rem` mixins have been deprecated.
-- The `$monospace` font stack variable has been deprecated in favor of new
+- The `em` and `rem` mixins have been removed.
+- The `$monospace` font stack variable has been removed in favor of new
   `$consolas`, `$courier-new` and `$monaco` variables.
-- The `triangle` mixin has been deprecated.
+- The `triangle` mixin has been removed.
+- The `retina-image` mixin has been removed.
 
 [5.0.0.alpha.0]: https://github.com/thoughtbot/bourbon/compare/v4.2.6...v5.0.0.alpha.0

data/README.md

@@ -18,7 +18,7 @@ for updates.
 
 ## Requirements
 
-- [Sass](https://github.com/sass/sass) 3.4+ or [LibSass](https://github.com/sass/libsass) 3.1+
+- [Sass](https://github.com/sass/sass) 3.4+ or [LibSass](https://github.com/sass/libsass) 3.3+
 
 ## Installation
 
@@ -52,7 +52,7 @@ For command line help, visit our wiki page on Bourbon’s [command line interfac
 
   It’s not recommended to add or modify the Bourbon files so that you can update them easily.
 
-## Installation for Ruby on Rails 3.1+
+## Installation for Ruby on Rails 4.2+
 
 1. Add Bourbon to your Gemfile:
 

data/bourbon.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "css_parser", "~> 1.3"
   s.add_development_dependency "rake", "~> 10.4"
   s.add_development_dependency "rspec", "~> 3.3"
-  s.add_development_dependency "scss_lint", "0.44"
+  s.add_development_dependency "scss_lint", "0.47"
   s.add_runtime_dependency "sass", "~> 3.4"
   s.add_runtime_dependency "thor", "~> 0.19"
   s.authors = [

data/bower.json

@@ -1,9 +1,9 @@
 {
-  "name": "bourbon",
+  "authors": [
+    "thoughtbot (http://thoughtbot.com)"
+  ],
   "description": "A simple and lightweight mixin library for Sass.",
-  "version": "5.0.0-beta.1",
-  "main": "core/_bourbon.scss",
-  "license": "MIT",
+  "homepage": "http://bourbon.io",
   "ignore": [
     "**/.*",
     "_site",
@@ -27,12 +27,12 @@
     "sass",
     "scss"
   ],
-  "authors": [
-    "thoughtbot (http://thoughtbot.com)"
-  ],
-  "homepage": "http://bourbon.io",
+  "license": "MIT",
+  "main": "core/_bourbon.scss",
+  "name": "bourbon",
   "repository": {
     "type": "git",
     "url": "https://github.com/thoughtbot/bourbon.git"
-  }
+  },
+  "version": "5.0.0-beta.2"
 }

data/core/_bourbon.scss

@@ -1,46 +1,48 @@
-// Bourbon 5.0.0-beta.1
+// Bourbon 5.0.0-beta.2
 // http://bourbon.io
 // Copyright 2011 thoughtbot, inc.
 // MIT License
 
-@import "bourbon/settings/scales";
+@import "bourbon/helpers/scales";
+@import "bourbon/helpers/timing-functions";
+
 @import "bourbon/settings/settings";
-@import "bourbon/settings/bourbon-get-setting";
 
-@import "bourbon/functions/assign-inputs";
-@import "bourbon/functions/collapse-directionals";
-@import "bourbon/functions/contains";
-@import "bourbon/functions/contains-falsy";
-@import "bourbon/functions/font-source-declaration";
-@import "bourbon/functions/is-length";
-@import "bourbon/functions/is-light";
-@import "bourbon/functions/is-number";
-@import "bourbon/functions/is-size";
-@import "bourbon/functions/shade";
-@import "bourbon/functions/strip-unit";
-@import "bourbon/functions/tint";
-@import "bourbon/functions/unpack";
+@import "bourbon/validators/contains";
+@import "bourbon/validators/contains-falsy";
+@import "bourbon/validators/is-length";
+@import "bourbon/validators/is-light";
+@import "bourbon/validators/is-number";
+@import "bourbon/validators/is-size";
 
-@import "bourbon/helpers/directional-values";
+@import "bourbon/utilities/assign-inputs";
+@import "bourbon/utilities/bourbon-get-setting";
+@import "bourbon/utilities/collapse-directionals";
+@import "bourbon/utilities/directional-values";
+@import "bourbon/utilities/font-source-declaration";
+@import "bourbon/utilities/unpack";
 
-@import "bourbon/addons/border-color";
-@import "bourbon/addons/border-radius";
-@import "bourbon/addons/border-style";
-@import "bourbon/addons/border-width";
-@import "bourbon/addons/buttons";
-@import "bourbon/addons/clearfix";
-@import "bourbon/addons/contrast-switch";
-@import "bourbon/addons/ellipsis";
-@import "bourbon/addons/font-face";
-@import "bourbon/addons/font-stacks";
-@import "bourbon/addons/hide-text";
-@import "bourbon/addons/hide-visually";
-@import "bourbon/addons/margin";
-@import "bourbon/addons/modular-scale";
-@import "bourbon/addons/padding";
-@import "bourbon/addons/position";
-@import "bourbon/addons/prefixer";
-@import "bourbon/addons/size";
-@import "bourbon/addons/text-inputs";
-@import "bourbon/addons/timing-functions";
-@import "bourbon/addons/word-wrap";
+@import "bourbon/library/border-color";
+@import "bourbon/library/border-radius";
+@import "bourbon/library/border-style";
+@import "bourbon/library/border-width";
+@import "bourbon/library/buttons";
+@import "bourbon/library/clearfix";
+@import "bourbon/library/contrast-switch";
+@import "bourbon/library/ellipsis";
+@import "bourbon/library/font-face";
+@import "bourbon/library/font-stacks";
+@import "bourbon/library/hide-text";
+@import "bourbon/library/hide-visually";
+@import "bourbon/library/margin";
+@import "bourbon/library/modular-scale";
+@import "bourbon/library/padding";
+@import "bourbon/library/position";
+@import "bourbon/library/prefixer";
+@import "bourbon/library/shade";
+@import "bourbon/library/size";
+@import "bourbon/library/strip-unit";
+@import "bourbon/library/text-inputs";
+@import "bourbon/library/tint";
+@import "bourbon/library/triangle";
+@import "bourbon/library/word-wrap";

data/core/bourbon/{addons → library}/_contrast-switch.scss

@@ -4,13 +4,13 @@
 /// for building button styles.
 ///
 /// @argument {color} $base-color
-///   The `color` to evaluate lightness against.
+///   The color to evaluate lightness against.
 ///
-/// @argument {color} $light-color [#000]
-///   The `color` to be output when `base-color` is light.
+/// @argument {color} $dark-color [#000]
+///   The color to be output when `$base-color` is light.
 ///
-/// @argument {color} $dark-color [#fff]
-///   The `color` to be output when `base-color` is dark.
+/// @argument {color} $light-color [#fff]
+///   The color to be output when `$base-color` is dark.
 ///
 /// @example scss
 ///   .first-element {
@@ -33,15 +33,15 @@
 ///     color: #eee;
 ///   }
 ///
-/// @require {function} is-light
+/// @require {function} _is-light
 ///
 /// @since 5.0.0
 
 @function contrast-switch(
     $base-color,
-    $light-color: #000,
-    $dark-color: #fff
+    $dark-color: _bourbon-get-setting("contrast-switch-dark-color"),
+    $light-color: _bourbon-get-setting("contrast-switch-light-color")
   ) {
 
-  @return if(is-light($base-color), $light-color, $dark-color);
+  @return if(_is-light($base-color), $dark-color, $light-color);
 }

data/core/bourbon/{addons → library}/_size.scss

@@ -36,12 +36,14 @@
   @if _is-size($height) {
     height: $height;
   } @else {
-    @error "`#{$height}` is not a valid length for the `$height` parameter in the `size` mixin.";
+    @error "`#{$height}` is not a valid length for the `$height` parameter " +
+           "in the `size` mixin.";
   }
 
   @if _is-size($width) {
     width: $width;
   } @else {
-    @error "`#{$width}` is not a valid length for the `$width` parameter in the `size` mixin.";
+    @error "`#{$width}` is not a valid length for the `$width` parameter " +
+           "in the `size` mixin.";
   }
 }

data/core/bourbon/library/_triangle.scss

@@ -0,0 +1,79 @@
+@charset "UTF-8";
+
+/// Generates a triangle pointing in a specified direction.
+///
+/// @argument {string} $direction [up]
+///   The direction the triangle should point. Accepts `up`, `up-right`,
+///   `right`, `down-right`, `down`, `down-left`, `left` or `up-left`.
+///
+/// @argument {color} $color [currentColor]
+///   Color of the triangle.
+///
+/// @argument {number (with unit)} $width [1rem]
+///   Width of the triangle.
+///
+/// @argument {number (with unit)} $height [($width / 2)]
+///   Height of the triangle.
+///
+/// @example scss
+///   .element {
+///     &::before {
+///       @include triangle(up, #b25c9c, 2rem);
+///       content: "";
+///     }
+///   }
+///
+/// @example css
+///   .element::before {
+///     border-style: solid;
+///     height: 0;
+///     width: 0;
+///     border-color: transparent transparent #b25c9c transparent;
+///     border-width: 0 1rem 1rem;
+///     content: "";
+///   }
+
+@mixin triangle(
+    $direction: up,
+    $color: currentColor,
+    $width: 1rem,
+    $height: ($width / 2)
+  ) {
+  @if not index(
+      "up" "up-right" "right" "down-right" "down" "down-left" "left" "up-left",
+      $direction
+    ) {
+    @error "Direction must be `up`, `up-right`, `right`, `down-right`, " +
+           "`down`, `down-left`, `left` or `up-left`.";
+  } @else {
+    border-style: solid;
+    height: 0;
+    width: 0;
+
+    @if $direction == "up" {
+      border-color: transparent transparent $color;
+      border-width: 0 ($width / 2) $height;
+    } @else if $direction == "up-right" {
+      border-color: transparent $color transparent transparent;
+      border-width: 0 $width $width 0;
+    } @else if $direction == "right" {
+      border-color: transparent transparent transparent $color;
+      border-width: ($height / 2) 0 ($height / 2) $width;
+    } @else if $direction == "down-right" {
+      border-color: transparent transparent $color;
+      border-width: 0 0 $width $width;
+    } @else if $direction == "down" {
+      border-color: $color transparent transparent;
+      border-width: $height ($width / 2) 0;
+    } @else if $direction == "down-left" {
+      border-color: transparent transparent transparent $color;
+      border-width: $width 0 0 $width;
+    } @else if $direction == "left" {
+      border-color: transparent $color transparent transparent;
+      border-width: ($height / 2) $width ($height / 2) 0;
+    } @else if $direction == "up-left" {
+      border-color: $color transparent transparent;
+      border-width: $width $width 0 0;
+    }
+  }
+}

data/core/bourbon/settings/_settings.scss

@@ -4,6 +4,12 @@
 ///
 /// @type map
 ///
+/// @property {color} contrast-switch-dark-color [#000]
+///   Global dark color for the `contrast-switch` function.
+///
+/// @property {color} contrast-switch-light-color [#fff]
+///   Global light color for the `contrast-switch` function.
+///
 /// @property {list} global-font-file-formats [("ttf", "woff2", "woff")]
 ///   Global font file formats for the `font-face` mixin.
 ///
@@ -20,6 +26,8 @@
 /// @access private
 
 $_bourbon-defaults: (
+  "contrast-switch-dark-color": #000,
+  "contrast-switch-light-color": #fff,
   "global-font-file-formats": ("ttf", "woff2", "woff"),
   "modular-scale-base": 1em,
   "modular-scale-ratio": $major-third,