bourbon 5.0.0.beta.7 → 5.0.0.beta.8

data/RELEASING.md

@@ -1,11 +1,12 @@
 # Releasing
 
 1. Update the version number in these places:
-  - `lib/bourbon/version.rb`
-  - `core/_bourbon.scss`
-  - `package.json`
-  - `bower.json`
-  - `README.md`
+
+    - `lib/bourbon/version.rb`
+    - `core/_bourbon.scss`
+    - `package.json`
+    - `bower.json`
+    - `README.md`
 
 1. Update `CHANGELOG.md`. We follow the guidelines from [Keep a CHANGELOG].
 
@@ -22,7 +23,7 @@
    _automatically be sent_ on the [@bourbonsass] Twitter account via [Zapier].
    It will look like this:
 
-   > We’ve released {release_title}: {release_link}
+    > We’ve released Bourbon {release_title}: {release_link}
 
 1. Re-generate and publish the [documentation website], using the available
    Rake tasks.

data/bourbon.gemspec

@@ -3,12 +3,12 @@ require "bourbon/version"
 
 Gem::Specification.new do |s|
   s.add_development_dependency "aruba", "~> 0.6.2"
-  s.add_development_dependency "css_parser", "~> 1.4.1"
-  s.add_development_dependency "rake", "~> 11.1.2"
-  s.add_development_dependency "rspec", "~> 3.4.0"
-  s.add_development_dependency "scss_lint", "0.48.0"
-  s.add_runtime_dependency "sass", "~> 3.4.22"
-  s.add_runtime_dependency "thor", "~> 0.19.1"
+  s.add_development_dependency "css_parser", "~> 1.4"
+  s.add_development_dependency "rake", "~> 11.1"
+  s.add_development_dependency "rspec", "~> 3.4"
+  s.add_development_dependency "scss_lint", "0.48"
+  s.add_runtime_dependency "sass", "~> 3.4"
+  s.add_runtime_dependency "thor", "~> 0.19"
   s.authors = [
     "Christian Reuter",
     "Damian Galarza",

data/bower.json

@@ -6,20 +6,21 @@
   "homepage": "http://bourbon.io",
   "ignore": [
     "**/.*",
-    "_site",
-    "bin",
+    "_site/",
+    "bin/",
     "bourbon.gemspec",
+    "circle.yml",
     "eyeglass-exports.js",
-    "features",
+    "features/",
     "Gemfile",
     "Gemfile.lock",
     "index.js",
-    "lib",
+    "lib/",
     "package.json",
+    "pkg/",
     "Rakefile",
     "RELEASING.md",
-    "sache.json",
-    "spec"
+    "spec/"
   ],
   "keywords": [
     "css",
@@ -34,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/thoughtbot/bourbon.git"
   },
-  "version": "5.0.0-beta.7"
+  "version": "5.0.0-beta.8"
 }

data/circle.yml

@@ -1,11 +1,14 @@
 dependencies:
   override:
     - bundle install
-    - npm install -g sassdoc
+    - npm install -g sassdoc@2.2.0
 general:
   branches:
     ignore:
       - gh-pages
+machine:
+  node:
+    version: 6.9.5
 test:
   override:
     - bundle exec rake

data/core/_bourbon.scss

@@ -1,6 +1,6 @@
-// Bourbon 5.0.0-beta.7
+// Bourbon 5.0.0-beta.8
 // http://bourbon.io
-// Copyright 2011 thoughtbot, inc.
+// Copyright 2011-2017 thoughtbot, inc.
 // MIT License
 
 @import "bourbon/helpers/buttons-list";
@@ -19,11 +19,11 @@
 @import "bourbon/utilities/assign-inputs";
 @import "bourbon/utilities/compact-shorthand";
 @import "bourbon/utilities/directional-property";
+@import "bourbon/utilities/fetch-bourbon-setting";
 @import "bourbon/utilities/font-source-declaration";
 @import "bourbon/utilities/gamma";
 @import "bourbon/utilities/lightness";
 @import "bourbon/utilities/contrast-ratio";
-@import "bourbon/utilities/retrieve-bourbon-setting";
 @import "bourbon/utilities/unpack-shorthand";
 
 @import "bourbon/library/border-color";

data/core/bourbon/library/_contrast-switch.scss

@@ -49,7 +49,7 @@
 ///     color: #eee;
 ///   }
 ///
-/// @require {function} _retrieve-bourbon-setting
+/// @require {function} _fetch-bourbon-setting
 ///
 /// @require {function} _is-color
 ///
@@ -58,11 +58,10 @@
 /// @since 5.0.0
 
 @function contrast-switch(
-    $base-color,
-    $dark-color: _retrieve-bourbon-setting("contrast-switch-dark-color"),
-    $light-color: _retrieve-bourbon-setting("contrast-switch-light-color")
-  ) {
-
+  $base-color,
+  $dark-color: _fetch-bourbon-setting("contrast-switch-dark-color"),
+  $light-color: _fetch-bourbon-setting("contrast-switch-light-color")
+) {
   @if not _is-color($base-color) {
     @error "`#{$base-color}` is not a valid color for the `$base-color` " +
            "argument in the `contrast-switch` function.";

data/core/bourbon/library/_ellipsis.scss

@@ -24,10 +24,9 @@
 ///   }
 
 @mixin ellipsis(
-    $width: 100%,
-    $display: inline-block
-  ) {
-
+  $width: 100%,
+  $display: inline-block
+) {
   display: $display;
   max-width: $width;
   overflow: hidden;

data/core/bourbon/library/_font-face.scss

@@ -25,10 +25,10 @@
 ///
 /// @example scss
 ///   @include font-face(
-///       "source-sans-pro",
-///       "fonts/source-sans-pro-regular",
-///       ("woff2", "woff")
-///     ) {
+///     "source-sans-pro",
+///     "fonts/source-sans-pro-regular",
+///     ("woff2", "woff")
+///   ) {
 ///     font-style: normal;
 ///     font-weight: 400;
 ///   }
@@ -44,15 +44,14 @@
 ///
 /// @require {function} _font-source-declaration
 ///
-/// @require {function} _retrieve-bourbon-setting
+/// @require {function} _fetch-bourbon-setting
 
 @mixin font-face(
-    $font-family,
-    $file-path,
-    $file-formats: _retrieve-bourbon-setting("global-font-file-formats"),
-    $asset-pipeline: _retrieve-bourbon-setting("rails-asset-pipeline")
-  ) {
-
+  $font-family,
+  $file-path,
+  $file-formats: _fetch-bourbon-setting("global-font-file-formats"),
+  $asset-pipeline: _fetch-bourbon-setting("rails-asset-pipeline")
+) {
   @font-face {
     font-family: $font-family;
     src: _font-source-declaration(

data/core/bourbon/library/_hide-visually.scss

@@ -16,7 +16,7 @@
 ///
 ///     &:active,
 ///     &:focus {
-///       @include hide-visually(unhide);
+///       @include hide-visually("unhide");
 ///     }
 ///   }
 ///
@@ -24,7 +24,7 @@
 ///   .element {
 ///     border: 0;
 ///     clip: rect(1px, 1px, 1px, 1px);
-///     clip-path: circle(1% at 1% 1%);
+///     clip-path: inset(100%);
 ///     height: 1px;
 ///     overflow: hidden;
 ///     padding: 0;
@@ -44,11 +44,14 @@
 ///
 /// @since 5.0.0
 
-@mixin hide-visually($toggle: hide) {
-  @if $toggle == "hide" {
+@mixin hide-visually($toggle: "hide") {
+  @if not index("hide" "unhide", $toggle) {
+    @error "`#{$toggle}` is not a valid value for the `$toggle` argument in " +
+           "the `hide-visually` mixin. Must be either `hide` or `unhide`.";
+  } @else if $toggle == "hide" {
     border: 0;
     clip: rect(1px, 1px, 1px, 1px);
-    clip-path: circle(1% at 1% 1%);
+    clip-path: inset(100%);
     height: 1px;
     overflow: hidden;
     padding: 0;

data/core/bourbon/library/_modular-scale.scss

@@ -65,14 +65,13 @@
 ///     font-size: 1.728em;
 ///   }
 ///
-/// @require {function} _retrieve-bourbon-setting
+/// @require {function} _fetch-bourbon-setting
 
 @function modular-scale(
-    $increment,
-    $value: _retrieve-bourbon-setting("modular-scale-base"),
-    $ratio: _retrieve-bourbon-setting("modular-scale-ratio")
-  ) {
-
+  $increment,
+  $value: _fetch-bourbon-setting("modular-scale-base"),
+  $ratio: _fetch-bourbon-setting("modular-scale-ratio")
+) {
   $v1: nth($value, 1);
   $v2: nth($value, length($value));
   $value: $v1;

data/core/bourbon/library/_position.scss

@@ -41,12 +41,10 @@
 /// @require {function} _unpack-shorthand
 
 @mixin position(
-    $position,
-    $box-edge-values
-  ) {
-
+  $position,
+  $box-edge-values
+) {
   $box-edge-values: _unpack-shorthand($box-edge-values);
-
   $offsets: (
     top:    nth($box-edge-values, 1),
     right:  nth($box-edge-values, 2),

data/core/bourbon/library/_prefixer.scss

@@ -26,11 +26,10 @@
 /// @author Hugo Giraudel
 
 @mixin prefixer(
-    $property,
-    $value,
-    $prefixes: ()
-  ) {
-
+  $property,
+  $value,
+  $prefixes: ()
+) {
   @each $prefix in $prefixes {
     #{"-" + $prefix + "-" + $property}: $value;
   }

data/core/bourbon/library/_shade.scss

@@ -20,10 +20,9 @@
 ///   }
 
 @function shade(
-    $color,
-    $percent
-  ) {
-
+  $color,
+  $percent
+) {
   @if not _is-color($color) {
     @error "`#{$color}` is not a valid color for the `$color` argument in " +
            "the `shade` mixin.";

data/core/bourbon/library/_size.scss

@@ -31,10 +31,9 @@
 /// @require {function} _is-size
 
 @mixin size(
-    $width,
-    $height: $width
-  ) {
-
+  $width,
+  $height: $width
+) {
   @if _is-size($height) {
     height: $height;
   } @else {

data/core/bourbon/library/_tint.scss

@@ -20,10 +20,9 @@
 ///   }
 
 @function tint(
-    $color,
-    $percent
-  ) {
-
+  $color,
+  $percent
+) {
   @if not _is-color($color) {
     @error "`#{$color}` is not a valid color for the `$color` argument in " +
            "the `tint` mixin.";

data/core/bourbon/library/_triangle.scss

@@ -2,23 +2,23 @@
 
 /// Generates a triangle pointing in a specified direction.
 ///
-/// @argument {string} $direction [up]
+/// @argument {string} $direction
 ///   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]
+/// @argument {number (with unit)} $width
 ///   Width of the triangle.
 ///
-/// @argument {number (with unit)} $height [($width / 2)]
+/// @argument {number (with unit)} $height
 ///   Height of the triangle.
 ///
+/// @argument {color} $color
+///   Color of the triangle.
+///
 /// @example scss
 ///   .element {
 ///     &::before {
-///       @include triangle(up, #b25c9c, 2rem);
+///       @include triangle("up", 2rem, 1rem, #b25c9c);
 ///       content: "";
 ///     }
 ///   }
@@ -28,21 +28,21 @@
 ///     border-style: solid;
 ///     height: 0;
 ///     width: 0;
-///     border-color: transparent transparent #b25c9c transparent;
+///     border-color: transparent transparent #b25c9c;
 ///     border-width: 0 1rem 1rem;
 ///     content: "";
 ///   }
 
 @mixin triangle(
-    $direction: up,
-    $color: currentColor,
-    $width: 1rem,
-    $height: ($width / 2)
-  ) {
+  $direction,
+  $width,
+  $height,
+  $color
+) {
   @if not index(
-      "up" "up-right" "right" "down-right" "down" "down-left" "left" "up-left",
-      $direction
-    ) {
+    "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 if not _is-color($color) {

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

@@ -26,11 +26,10 @@
 /// @author Matthew Tobiasz
 
 @mixin value-prefixer(
-    $property,
-    $value,
-    $prefixes: ()
-  ) {
-
+  $property,
+  $value,
+  $prefixes: ()
+) {
   @each $prefix in $prefixes {
     #{$property}: #{"-" + $prefix + "-" + $value};
   }

data/core/bourbon/utilities/_assign-inputs.scss

@@ -13,10 +13,9 @@
 /// @access private
 
 @function _assign-inputs(
-    $inputs,
-    $pseudo: null
-  ) {
-
+  $inputs,
+  $pseudo: null
+) {
   $list: ();
 
   @each $input in $inputs {

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

@@ -33,11 +33,10 @@
 /// @access private
 
 @mixin _directional-property(
-    $property,
-    $suffix,
-    $values
-  ) {
-
+  $property,
+  $suffix,
+  $values
+) {
   $top:    $property + "-top"    + if($suffix, "-#{$suffix}", "");
   $bottom: $property + "-bottom" + if($suffix, "-#{$suffix}", "");
   $left:   $property + "-left"   + if($suffix, "-#{$suffix}", "");

data/core/bourbon/utilities/{_retrieve-bourbon-setting.scss → _fetch-bourbon-setting.scss}

@@ -7,10 +7,10 @@
 /// @return {boolean | color | list | number | string}
 ///
 /// @example scss
-///   _retrieve-bourbon-setting(rails-asset-pipeline)
+///   _fetch-bourbon-setting(rails-asset-pipeline)
 ///
 /// @access private
 
-@function _retrieve-bourbon-setting($setting) {
+@function _fetch-bourbon-setting($setting) {
   @return map-get(map-merge($_bourbon-defaults, $bourbon), $setting);
 }