bourbon 5.0.0.beta.6 → 5.0.0.beta.7

data/core/bourbon/library/_triangle.scss

@@ -23,7 +23,7 @@
 ///     }
 ///   }
 ///
-/// @example css
+///   // CSS Output
 ///   .element::before {
 ///     border-style: solid;
 ///     height: 0;

data/core/bourbon/library/_value-prefixer.scss

@@ -16,7 +16,7 @@
 ///     @include value-prefixer(cursor, grab, ("webkit", "moz"));
 ///   }
 ///
-/// @example css
+///   // CSS Output
 ///   .element {
 ///     cursor: -webkit-grab;
 ///     cursor: -moz-grab;

data/core/bourbon/settings/_settings.scss

@@ -1,6 +1,7 @@
 @charset "UTF-8";
 
-/// Default Bourbon configuration settings.
+/// Default global Bourbon settings. Values in this map are overwritten by any
+/// values set in the `$bourbon` map.
 ///
 /// @type map
 ///
@@ -20,8 +21,9 @@
 ///   Global base ratio for the `modular-scale` function.
 ///
 /// @property {boolean} rails-asset-pipeline [false]
-///   Enable or disable the `$asset-pipeline` variable for all functions that
-///   accept it.
+///   Set this to `true` when using the Rails Asset Pipeline and Bourbon will
+///   write asset paths using
+///   [sass-rails’ asset helpers](https://github.com/rails/sass-rails#asset-helpers).
 ///
 /// @access private
 
@@ -34,10 +36,32 @@ $_bourbon-defaults: (
   "rails-asset-pipeline": false,
 );
 
-/// User overrides of Bourbon configuration settings.
+/// Global Bourbon settings.
+///
+/// @name Settings
 ///
 /// @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.
+///
+/// @property {number (with unit)} modular-scale-base [1em]
+///   Global base value for the `modular-scale` function.
+///
+/// @property {number (unitless)} modular-scale-ratio [$major-third (1.25)]
+///   Global base ratio for the `modular-scale` function.
+///
+/// @property {boolean} rails-asset-pipeline [false]
+///   Set this to `true` when using the Rails Asset Pipeline and Bourbon will
+///   write asset paths using
+///   [sass-rails’ asset helpers](https://github.com/rails/sass-rails#asset-helpers).
+///
 /// @example scss
 ///   $bourbon: (
 ///     "contrast-switch-dark-color": #000,

data/core/bourbon/utilities/{_collapse-directionals.scss → _compact-shorthand.scss}

@@ -2,34 +2,22 @@
 
 // scss-lint:disable ElsePlacement
 
-/// Directional-property mixins are shorthands for writing properties like
-/// the following.
-///
-/// @ignore You can also use `false` instead of `null`.
+/// Transforms shorthand to its shortest possible form.
 ///
 /// @argument {list} $values
 ///   List of directional values.
 ///
-/// @example scss - Usage
-///   .element {
-///     @include border-style(dotted null);
-///     @include margin(null 0 10px);
-///   }
+/// @example scss
+///   $values: _compact-shorthand(10px 20px 10px 20px);
 ///
-/// @example css - CSS Output
-///   .element {
-///     border-bottom-style: dotted;
-///     border-top-style: dotted;
-///     margin-bottom: 10px;
-///     margin-left: 0;
-///     margin-right: 0;
-///   }
+///   // Output
+///   $values: 10px 20px;
 ///
 /// @return {list}
 ///
 /// @access private
 
-@function _collapse-directionals($values) {
+@function _compact-shorthand($values) {
   $output: null;
 
   $a: nth($values, 1);

data/core/bourbon/utilities/_contrast-ratio.scss

@@ -0,0 +1,31 @@
+@charset "UTF-8";
+
+/// Programatically determines the contrast ratio between two colors.
+///
+/// Note that the alpha channel is ignored.
+///
+/// @link https://goo.gl/54htLV
+///
+/// @argument {color (hex)} $color-1
+///
+/// @argument {color (hex)} $color-2
+///
+/// @return {number (1-21)}
+///
+/// @example scss
+///   _contrast-ratio(black, white)
+///
+/// @require {function} _lightness
+///
+/// @access private
+
+@function _contrast-ratio($color-1, $color-2) {
+  $-local-lightness-1: _lightness($color-1) + 0.05;
+  $-local-lightness-2: _lightness($color-2) + 0.05;
+
+  @if $-local-lightness-1 > $-local-lightness-2 {
+    @return $-local-lightness-1 / $-local-lightness-2;
+  } @else {
+    @return $-local-lightness-2 / $-local-lightness-1;
+  }
+}

data/core/bourbon/utilities/_directional-property.scss

@@ -0,0 +1,71 @@
+@charset "UTF-8";
+
+// scss-lint:disable SpaceAroundOperator
+
+/// Builds directional properties by parsing CSS shorthand values. For example,
+/// a value of `10px null` will output top and bottom directional properties,
+/// but the `null` skips left and right from being output.
+///
+/// @argument {string} $property
+///   Base property.
+///
+/// @argument {string} $suffix
+///   Suffix to append. Use `null` to omit.
+///
+/// @argument {list} $values
+///   List of values to set for the property.
+///
+/// @example scss
+///   .element {
+///     @include _directional-property(border, width, null 5px);
+///   }
+///
+///   // CSS Output
+///   .element {
+///     border-right-width: 5px;
+///     border-left-width: 5px;
+///   }
+///
+/// @require {function} _compact-shorthand
+///
+/// @require {function} _contains-falsy
+///
+/// @access private
+
+@mixin _directional-property(
+    $property,
+    $suffix,
+    $values
+  ) {
+
+  $top:    $property + "-top"    + if($suffix, "-#{$suffix}", "");
+  $bottom: $property + "-bottom" + if($suffix, "-#{$suffix}", "");
+  $left:   $property + "-left"   + if($suffix, "-#{$suffix}", "");
+  $right:  $property + "-right"  + if($suffix, "-#{$suffix}", "");
+  $all:    $property +             if($suffix, "-#{$suffix}", "");
+
+  $values: _compact-shorthand($values);
+
+  @if _contains-falsy($values) {
+    @if nth($values, 1) { #{$top}: nth($values, 1); }
+
+    @if length($values) == 1 {
+      @if nth($values, 1) { #{$right}: nth($values, 1); }
+    } @else {
+      @if nth($values, 2) { #{$right}: nth($values, 2); }
+    }
+
+    @if length($values) == 2 {
+      @if nth($values, 1) { #{$bottom}: nth($values, 1); }
+      @if nth($values, 2) { #{$left}: nth($values, 2); }
+    } @else if length($values) == 3 {
+      @if nth($values, 3) { #{$bottom}: nth($values, 3); }
+      @if nth($values, 2) { #{$left}: nth($values, 2); }
+    } @else if length($values) == 4 {
+      @if nth($values, 3) { #{$bottom}: nth($values, 3); }
+      @if nth($values, 4) { #{$left}: nth($values, 4); }
+    }
+  } @else {
+    #{$all}: $values;
+  }
+}

data/core/bourbon/utilities/_font-source-declaration.scss

@@ -2,7 +2,7 @@
 
 /// Builds the `src` list for an `@font-face` declaration.
 ///
-/// @link http://goo.gl/Ru1bKP
+/// @link https://goo.gl/Ru1bKP
 ///
 /// @argument {string} $font-family
 ///

data/core/bourbon/utilities/_gamma.scss

@@ -0,0 +1,21 @@
+@charset "UTF-8";
+
+/// Performs gamma correction on a single color channel.
+///
+/// Note that Sass does not have a `pow()` function, so the calculation
+/// is approximate.
+///
+/// @argument {number (0-1)} $channel
+///
+/// @return {number (0-1)}
+///
+/// @access private
+
+@function _gamma($channel) {
+  @if $channel < 0.03928 {
+    @return $channel / 12.92;
+  } @else {
+    $c: ($channel + 0.055) / 1.055;
+    @return (133 * $c * $c * $c + 155 * $c * $c) / 288;
+  }
+}

data/core/bourbon/utilities/_lightness.scss

@@ -0,0 +1,24 @@
+@charset "UTF-8";
+
+/// Programatically determines the lightness of a color.
+///
+/// @argument {color (hex)} $hex-color
+///
+/// @return {number (0-1)}
+///
+/// @example scss
+///   _lightness($color)
+///
+/// @access private
+
+@function _lightness($hex-color) {
+  $-local-red-raw: red(rgba($hex-color, 1));
+  $-local-green-raw: green(rgba($hex-color, 1));
+  $-local-blue-raw: blue(rgba($hex-color, 1));
+
+  $-local-red: _gamma($-local-red-raw / 255);
+  $-local-green: _gamma($-local-green-raw / 255);
+  $-local-blue: _gamma($-local-blue-raw / 255);
+
+  @return $-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722;
+}

data/core/bourbon/utilities/{_unpack.scss → _unpack-shorthand.scss}

@@ -1,22 +1,22 @@
 @charset "UTF-8";
 
-/// Converts shorthand to the 4-value syntax.
+/// Transforms shorthand that can range from 1-to-4 values to be 4 values.
 ///
 /// @argument {list} $shorthand
 ///
 /// @example scss
 ///   .element {
-///     margin: _unpack(1em 2em);
+///     margin: _unpack-shorthand(1em 2em);
 ///   }
 ///
-/// @example css
+///   // CSS Output
 ///   .element {
 ///     margin: 1em 2em 1em 2em;
 ///   }
 ///
 /// @access private
 
-@function _unpack($shorthand) {
+@function _unpack-shorthand($shorthand) {
   @if length($shorthand) == 1 {
     @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1);
   } @else if length($shorthand) == 2 {

data/core/bourbon/validators/_contains-falsy.scss

@@ -1,6 +1,6 @@
 @charset "UTF-8";
 
-/// Checks if a list does not contains a value.
+/// Checks if a list does not contain any values.
 ///
 /// @argument {list} $list
 ///   The list to check against.

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "5.0.0.beta.6"
+  VERSION = "5.0.0.beta.7"
 end

data/package.json

@@ -6,7 +6,7 @@
   "bugs": {
     "url": "https://github.com/thoughtbot/bourbon/issues"
   },
-  "description": "A simple and lightweight mixin library for Sass.",
+  "description": "A lightweight Sass tool set.",
   "eyeglass": {
     "needs": "*",
     "exports": "eyeglass-exports.js"
@@ -29,5 +29,5 @@
   "scripts": {
     "test": "bundle exec rake"
   },
-  "version": "5.0.0-beta.6"
+  "version": "5.0.0-beta.7"
 }

data/spec/bourbon/library/font_stacks_spec.rb

@@ -19,11 +19,13 @@ describe "font-stacks" do
       consolas = '"Consolas", "monaco", monospace'
       courier_new = '"Courier New", "Courier", "Lucida Sans Typewriter", ' +
                     '"Lucida Typewriter", monospace'
-      monaco = '"monaco", "Consolas", "Lucida Console", monospace'
+      monaco = '"Monaco", "Consolas", "Lucida Console", monospace'
 
-      system = '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", ' +
-               '"Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", ' +
-               '"Helvetica Neue", sans-serif'
+      system = '-apple-system, BlinkMacSystemFont, "Avenir Next", "Avenir", ' +
+               '"Segoe UI", "Lucida Grande", "Helvetica Neue", "Helvetica", ' +
+               '"Fira Sans", "Roboto", "Noto", "Droid Sans", "Cantarell", ' +
+               '"Oxygen", "Ubuntu", "Franklin Gothic Medium", ' +
+               '"Century Gothic", "Liberation Sans", sans-serif'
 
       expect(".helvetica").to have_value(helvetica)
       expect(".lucida-grande").to have_value(lucida_grande)

data/spec/bourbon/library/hide_visually_spec.rb

@@ -14,6 +14,7 @@ describe "hide-visually" do
                 "overflow: hidden; " +
                 "padding: 0; " +
                 "position: absolute; " +
+                "white-space: nowrap; " +
                 "width: 1px;"
 
       expect(".hide-visually").to have_ruleset(ruleset)
@@ -27,6 +28,7 @@ describe "hide-visually" do
                 "height: auto; " +
                 "overflow: visible; " +
                 "position: static; " +
+                "white-space: inherit; " +
                 "width: auto;"
 
       expect(".hide-visually--unhide").to have_ruleset(ruleset)

data/spec/bourbon/library/overflow_wrap_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe "overflow-wrap" do
+  before(:all) do
+    ParserSupport.parse_file("library/overflow-wrap")
+  end
+
+  context "called on element" do
+    it "adds overflow-wrap and word-wrap" do
+      input = ".overflow-wrap"
+      ruleset = "word-wrap: break-word; " +
+                "overflow-wrap: break-word;"
+
+      expect(input).to have_ruleset(ruleset)
+    end
+  end
+
+  context "called on element with normal" do
+    it "sets values as normal" do
+      input = ".overflow-wrap-normal"
+      ruleset = "word-wrap: normal; " +
+                "overflow-wrap: normal;"
+
+      expect(input).to have_ruleset(ruleset)
+    end
+  end
+end

data/spec/bourbon/utilities/compact_shorthand_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe "compact-shorthand" do
+  before(:all) do
+    ParserSupport.parse_file("utilities/compact-shorthand")
+  end
+
+  context "compact-shorthand" do
+    it "returns four values unaltered" do
+      expect(".four-values-a").to have_rule("padding: 10px 20px 30px 40px")
+    end
+
+    it "returns four values when the left and right values are not equal" do
+      expect(".four-values-b").to have_rule("padding: 5px 10px 5px 20px")
+    end
+
+    it "compacts four values to two values when the top/bottom and " +
+       "left/right values are equal" do
+      expect(".two-values").to have_rule("padding: 50px 100px")
+    end
+
+    it "compacts four values to one value when they all match" do
+      expect(".one-value").to have_rule("padding: 10px")
+    end
+
+    it "skips null values" do
+      expect(".null-value").to have_rule("padding: 10px 20px")
+    end
+  end
+end

data/spec/bourbon/utilities/{directional_values_spec.rb → directional_property_spec.rb}

@@ -1,8 +1,8 @@
 require "spec_helper"
 
-describe "directional-values" do
+describe "directional-property" do
   before(:all) do
-    ParserSupport.parse_file("utilities/directional-values")
+    ParserSupport.parse_file("utilities/directional-property")
   end
 
   context "directional-property" do
@@ -17,5 +17,12 @@ describe "directional-values" do
     it "returns property and value with vertical and horizontal values" do
       expect(".border-color").to have_rule("border-color: #fff #000")
     end
+
+    it "returns properties for top and bottom margin" do
+      ruleset = "margin-top: 20px; " +
+                "margin-bottom: 10px;"
+
+      expect(".margin-null").to have_ruleset(ruleset)
+    end
   end
 end