bourbon 5.0.1 → 7.1.0

data/core/bourbon/settings/_settings.scss

@@ -11,7 +11,7 @@
 /// @property {color} contrast-switch-light-color [#fff]
 ///   Global light color for the `contrast-switch` function.
 ///
-/// @property {list} global-font-file-formats [("ttf", "woff2", "woff")]
+/// @property {list} global-font-file-formats [("woff2", "woff")]
 ///   Global font file formats for the `font-face` mixin.
 ///
 /// @property {number (with unit)} modular-scale-base [1em]
@@ -30,7 +30,7 @@
 $_bourbon-defaults: (
   "contrast-switch-dark-color": #000,
   "contrast-switch-light-color": #fff,
-  "global-font-file-formats": ("ttf", "woff2", "woff"),
+  "global-font-file-formats": ("woff2", "woff"),
   "modular-scale-base": 1em,
   "modular-scale-ratio": $major-third,
   "rails-asset-pipeline": false,
@@ -48,7 +48,7 @@ $_bourbon-defaults: (
 /// @property {color} contrast-switch-light-color [#fff]
 ///   Global light color for the `contrast-switch` function.
 ///
-/// @property {list} global-font-file-formats [("ttf", "woff2", "woff")]
+/// @property {list} global-font-file-formats [("woff2", "woff")]
 ///   Global font file formats for the `font-face` mixin.
 ///
 /// @property {number (with unit)} modular-scale-base [1em]
@@ -66,7 +66,7 @@ $_bourbon-defaults: (
 ///   $bourbon: (
 ///     "contrast-switch-dark-color": #000,
 ///     "contrast-switch-light-color": #fff,
-///     "global-font-file-formats": ("ttf", "woff2", "woff"),
+///     "global-font-file-formats": ("woff2", "woff"),
 ///     "modular-scale-base": 1em,
 ///     "modular-scale-ratio": $major-third,
 ///     "rails-asset-pipeline": false,

data/core/bourbon/utilities/_compact-shorthand.scss

@@ -1,7 +1,5 @@
 @charset "UTF-8";
 
-// scss-lint:disable ElsePlacement
-
 /// Transforms shorthand to its shortest possible form.
 ///
 /// @argument {list} $values
@@ -30,10 +28,15 @@
   @if $c == 0 { $c: 0; }
   @if $d == 0 { $d: 0; }
 
-  @if $a == $b and $a == $c and $a == $d { $output: $a;          }
-  @else if $a == $c and $b == $d         { $output: $a $b;       }
-  @else if $b == $d                      { $output: $a $b $c;    }
-  @else                                  { $output: $a $b $c $d; }
+  @if $a == $b and $a == $c and $a == $d {
+    $output: $a;
+  } @else if $a == $c and $b == $d {
+    $output: $a $b;
+  } @else if $b == $d {
+    $output: $a $b $c;
+  } @else {
+    $output: $a $b $c $d;
+  }
 
   @return $output;
 }

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

@@ -19,13 +19,15 @@
 ///
 /// @access private
 
+@use "sass:math";
+
 @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;
+    @return math.div($-local-lightness-1, $-local-lightness-2);
   } @else {
-    @return $-local-lightness-2 / $-local-lightness-1;
+    @return math.div($-local-lightness-2, $-local-lightness-1);
   }
 }

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

@@ -1,7 +1,5 @@
 @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.
@@ -37,11 +35,11 @@
   $suffix,
   $values
 ) {
-  $top:    $property + "-top"    + if($suffix, "-#{$suffix}", "");
+  $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}", "");
+  $left: $property + "-left" + if($suffix, "-#{$suffix}", "");
+  $right: $property + "-right" + if($suffix, "-#{$suffix}", "");
+  $all: $property + if($suffix, "-#{$suffix}", "");
 
   $values: _compact-shorthand($values);
 

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

@@ -27,23 +27,24 @@
   $src: ();
 
   $formats-map: (
-    eot:   "#{$file-path}.eot?#iefix" format("embedded-opentype"),
-    woff2: "#{$file-path}.woff2" format("woff2"),
-    woff:  "#{$file-path}.woff" format("woff"),
-    ttf:   "#{$file-path}.ttf" format("truetype"),
-    svg:   "#{$file-path}.svg##{$font-family}" format("svg"),
+    "woff2": "#{$file-path}.woff2" format("woff2"),
+    "woff": "#{$file-path}.woff" format("woff"),
   );
 
-  @each $key, $values in $formats-map {
-    @if _contains($file-formats, $key) {
-      $file-path: nth($values, 1);
-      $font-format: nth($values, 2);
+  @each $format in $file-formats {
+    @if _contains(map-keys($formats-map), $format) {
+      $value: map-get($formats-map, $format);
+      $file-path: nth($value, 1);
+      $font-format: nth($value, 2);
 
       @if $asset-pipeline == true {
         $src: append($src, font-url($file-path) $font-format, comma);
       } @else {
         $src: append($src, url($file-path) $font-format, comma);
       }
+    } @else {
+      @error "`#{$file-formats}` contains an unsupported font file format. " +
+        "Must be `woff` and/or `woff2`.";
     }
   }
 

data/core/bourbon/utilities/_gamma.scss

@@ -2,8 +2,7 @@
 
 /// Performs gamma correction on a single color channel.
 ///
-/// Note that Sass does not have a `pow()` function, so the calculation
-/// is approximate.
+/// Note that the calculation is approximate if a `pow()` is not available.
 ///
 /// @argument {number (0-1)} $channel
 ///
@@ -11,11 +10,17 @@
 ///
 /// @access private
 
+@use "sass:math";
+
 @function _gamma($channel) {
   @if $channel < 0.03928 {
-    @return $channel / 12.92;
+    @return math.div($channel, 12.92);
   } @else {
-    $c: ($channel + 0.055) / 1.055;
-    @return (133 * $c * $c * $c + 155 * $c * $c) / 288;
+    $c: math.div($channel + 0.055, 1.055);
+    @if function-exists("pow") {
+      @return pow($c, 2.4);
+    } @else {
+      @return 0.56 * $c * $c * $c + 0.44 * $c * $c;
+    }
   }
 }

data/core/bourbon/utilities/_lightness.scss

@@ -11,14 +11,16 @@
 ///
 /// @access private
 
+@use "sass:math";
+
 @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);
+  $-local-red: _gamma(math.div($-local-red-raw, 255));
+  $-local-green: _gamma(math.div($-local-green-raw, 255));
+  $-local-blue: _gamma(math.div($-local-blue-raw, 255));
 
   @return $-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722;
 }

data/core/bourbon/validators/_is-length.scss

@@ -9,7 +9,12 @@
 /// @access private
 
 @function _is-length($value) {
-  @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))));
+  @return type-of($value) != "null"
+    and (
+      str-slice($value + "", 1, 4) == "calc"
+      or str-slice($value + "", 1, 3) == "var"
+      or str-slice($value + "", 1, 3) == "env"
+      or index(auto inherit initial 0, $value)
+      or (type-of($value) == "number" and not(unitless($value)))
+    );
 }

data/core/bourbon/validators/_is-size.scss

@@ -14,5 +14,5 @@
 
 @function _is-size($value) {
   @return _is-length($value)
-          or _contains("fill" "fit-content" "min-content" "max-content", $value);
+    or _contains("fill" "fit-content" "min-content" "max-content", $value);
 }

data/lib/bourbon/version.rb

@@ -1,3 +1,3 @@
 module Bourbon
-  VERSION = "5.0.1"
+  VERSION = "7.1.0"
 end

data/lib/bourbon.rb

@@ -1,12 +1,15 @@
-require "sass"
 require "bourbon/generator"
 
 module Bourbon
   if defined?(Rails) && defined?(Rails::Engine)
     class Engine < ::Rails::Engine
-      config.assets.paths << File.expand_path("../../core", __FILE__)
+      config.assets.paths << File.expand_path("../core", __dir__)
     end
   else
-    Sass.load_paths << File.expand_path("../../core", __FILE__)
+    begin
+      require "sass"
+      Sass.load_paths << File.expand_path("../core", __dir__)
+    rescue LoadError
+    end
   end
 end