bourbon 6.0.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a360bd2567304c4ae49d8e9d97716cd0d3d0abb88a8ede44aa5b68301b479c73
-  data.tar.gz: 485fa493c958cb331bc76eecea565bce515bd36f6290d9c0c92df5baf8e4a343
+  metadata.gz: 9643a51902ac7ed19eb9ec07b9b4ce3edf9930dd8c9bf0614f0aa26015f5fc67
+  data.tar.gz: e062e0e0e72a55e3f707e6cb4aaa8e584a5b2e2db6673da4b95702ef4eeb34f4
 SHA512:
-  metadata.gz: bc8960becf33315e221f8f71a6ceab0a94c186b92ae6c5b64e019469ba864837fb30e53af6465121fc39d47da848c2d5f2a1e1dedbe38ed02140252205716871
-  data.tar.gz: 6e55d39b9925e3b745a2722b818469e6e8b37a295c833bf82c91c6d986fdb262ecbffb4ebef09b4c8cf55ff489290b12cfc19eef72c9645660db32dbdc88037d
+  metadata.gz: 3ff945a5d401efaaab35635c245e823b2085424adbcb8bddc23fb574d56fdc43af50f29f895c48774f99547c084c5e43ce4f9a8b4abcc4072adc32ea97cd2582
+  data.tar.gz: 25770a307ff47b90edf8a223c7601fd819917657104ddefc45fdc0f1ac0678f89fb97b25415569e8f962d90abbfc40eebfcfcc5ec58ca73f05a152d847632869

data/.circleci/config.yml

@@ -1,34 +1,24 @@
 version: 2
-
 jobs:
   build:
     docker:
-      - image: circleci/ruby:2.6.3-node
-
+      - image: circleci/ruby:2.6.5-node
     steps:
       - checkout
-
       - restore_cache:
           keys:
-            - bourbon-{{ arch }}-{{ checksum "bourbon.gemspec" }}
-
+            - bourbon-bundle-v1-{{ checksum "bourbon.gemspec" }}
+            - bourbon-bundle-v1-
       - run:
-          name: Install Ruby dependencies
+          name: Run Bundler
           command: bundle install --path vendor/bundle
-
-      - run:
-          name: Install SassDoc
-          command: sudo npm install -g sassdoc@2.5.0
-
       - save_cache:
-          key: bourbon-{{ arch }}-{{ checksum "bourbon.gemspec" }}
+          key: bourbon-bundle-v1-{{ checksum "bourbon.gemspec" }}
           paths:
             - vendor/bundle
-
       - run:
           name: Run the tests
           command: bundle exec rake
-
       - run:
           name: Parse SassDoc comments
-          command: sassdoc core/ --parse --verbose --strict
+          command: npm run sassdoc

data/.hound.yml

@@ -5,3 +5,4 @@ scss:
 stylelint:
   config_file: .stylelintrc.json
   enabled: true
+  # version: 10.1.0

data/.tool-versions

@@ -1,2 +1,2 @@
-ruby 2.6.3
-nodejs 10.16.0
+ruby 2.6.5
+nodejs 12.16.1

data/CHANGELOG.md

@@ -3,11 +3,41 @@
 All notable changes to this project will be documented in this file. This
 project adheres to [Semantic Versioning](http://semver.org).
 
-## [Unreleased (`master`)][unreleased]
+## [7.2.0] - 2022-02-22
 
-Nothing at the moment.
+### Changed
+
+- Revert "Replace `/` with `math.div` per Dart Sass 2.0.0 updates."
+
+[7.2.0]: https://github.com/thoughtbot/bourbon/compare/v7.1.0...v7.2.0
+
+## [7.1.0] - 2022-02-22
+
+### Changed
+
+- Replace `/` with `math.div` per Dart Sass 2.0.0 updates.
+
+[7.1.0]: https://github.com/thoughtbot/bourbon/compare/v7.0.0...v7.1.0
+
+## [7.0.0] - 2020-03-09
+
+### Added
+
+- Improved error handling of unsupported font file formats in the `font-face`
+  mixin (supported formats are `woff2` and `woff`).
+- CSS `var()` and `env()` functions are now accepted as values in the
+  `position` and `size` mixins.
+
+### Changed
+
+- Updated `thor` from 0.x to 1.x
+
+### Removed
+
+- The `font-face` mixin no longer supports `ttf`, `svg`, and `eot`
+  font file formats.
 
-[unreleased]: https://github.com/thoughtbot/bourbon/compare/v6.0.0...HEAD
+[7.0.0]: https://github.com/thoughtbot/bourbon/compare/v6.0.0...v7.0.0
 
 ## [6.0.0] - 2019-07-10
 

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright © 2011-2019 [thoughtbot, inc.](http://thoughtbot.com)
+Copyright © 2011-2020 [thoughtbot, inc.](http://thoughtbot.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the “Software”), to deal

data/README.md

@@ -29,7 +29,6 @@ It is…
 - [Installation](#installation)
 - [Command Line Interface](#command-line-interface)
 - [Browser Support](#browser-support)
-- [The Bourbon Family](#the-bourbon-family)
 - [Contributing](#contributing)
 - [License](#license)
 - [About](#about)
@@ -177,16 +176,6 @@ bourbon [options]
 Bourbon supports Internet Explorer 11+ and the latest versions of Chrome,
 Firefox, Safari, and Edge.
 
-## The Bourbon Family
-
-Bourbon is part of a larger, modular family of Sass utilities:
-
-- [Neat]: A lightweight and flexible Sass grid
-- [Bitters]: Scaffold styles, variables and structure for Bourbon projects
-
-  [Neat]: https://github.com/thoughtbot/neat
-  [Bitters]: https://github.com/thoughtbot/bitters
-
 ## Contributing
 
 See the [contributing] document. Thank you, [contributors]!
@@ -196,14 +185,14 @@ See the [contributing] document. Thank you, [contributors]!
 
 ## License
 
-Bourbon is copyright © 2011-2019 [thoughtbot, inc.][thoughtbot] It is free
+Bourbon is copyright © 2011-2020 [thoughtbot, inc.][thoughtbot] It is free
 software, and may be redistributed under the terms specified in the [license].
 
   [license]: LICENSE.md
 
 ## About
 
-Bourbon is maintained by Tyson Gach and the thoughtbot design team. It is funded
+Bourbon is maintained by the thoughtbot design team. It is funded
 by [thoughtbot, inc.][thoughtbot] and the names and logos for thoughtbot are
 trademarks of thoughtbot, inc.
 

data/RELEASING.md

@@ -6,7 +6,8 @@
     - `core/_bourbon.scss`
     - `package.json`
 
-1. Update `CHANGELOG.md`. We follow the guidelines from [Keep a CHANGELOG].
+1. Update `CHANGELOG.md`. We follow the guidelines from
+   [Keep a Changelog][keep-a-changelog].
 
 1. Commit changes. Use the convention “Bourbon vX.X.X” in your commit message.
    There shouldn’t be code changes, and thus CI doesn’t need to run.
@@ -17,17 +18,15 @@
 1. Run `npm publish`, which pushes the new version to npm’s registry (if
    releasing a pre-release, run `npm publish --tag beta`).
 
-1. Draft a [new GitHub release][github-release]. Upon publishing, a tweet will
-   _automatically be sent_ on the [@bourbonsass] Twitter account via [Zapier].
-   It will look like this:
+1. Draft a [new GitHub release][github-release].
+
+1. Tweet about the release from the [@bourbonsass] Twitter account, e.g.
 
     > We’ve released Bourbon {release_title}: {release_link}
 
-1. Re-generate and publish the [documentation website], using the available
-   Rake tasks.
+1. Re-generate and publish the [documentation website][website].
 
-[Keep a CHANGELOG]: http://keepachangelog.com
+[keep-a-changelog]: https://keepachangelog.com/en/1.0.0/
 [github-release]: https://github.com/thoughtbot/bourbon/releases/new
-[documentation website]: https://github.com/thoughtbot/bourbon.io
 [@bourbonsass]: https://twitter.com/bourbonsass
-[Zapier]: https://zapier.com
+[website]: https://github.com/thoughtbot/bourbon.io

data/bourbon.gemspec

@@ -5,9 +5,10 @@ Gem::Specification.new do |s|
   s.add_development_dependency "aruba", "~> 0.14"
   s.add_development_dependency "css_parser", "~> 1.4"
   s.add_development_dependency "cucumber", "~> 2.0"
-  s.add_development_dependency "rake", "~> 11.1"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec", "~> 3.4"
-  s.add_runtime_dependency "thor", "~> 0.19"
+  s.add_development_dependency "sass"
+  s.add_runtime_dependency "thor", "~> 1.0"
   s.authors = [
     "Christian Reuter",
     "Damian Galarza",

data/core/_bourbon.scss

@@ -1,6 +1,6 @@
-// Bourbon 6.0.0
+// Bourbon 7.2.0
 // https://www.bourbon.io/
-// Copyright 2011-2019 thoughtbot, inc.
+// Copyright 2011-2020 thoughtbot, inc.
 // MIT License
 
 @import "bourbon/helpers/buttons-list";

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

@@ -64,13 +64,13 @@
 ) {
   @if not _is-color($base-color) {
     @error "`#{$base-color}` is not a valid color for the `$base-color` " +
-           "argument in the `contrast-switch` function.";
+      "argument in the `contrast-switch` function.";
   } @else if not _is-color($dark-color) {
     @error "`#{$dark-color}` is not a valid color for the `$dark-color` " +
-           "argument in the `contrast-switch` function.";
+      "argument in the `contrast-switch` function.";
   } @else if not _is-color($light-color) {
     @error "`#{$light-color}` is not a valid color for the `$light-color` " +
-           "argument in the `contrast-switch` function.";
+      "argument in the `contrast-switch` function.";
   } @else {
     $-contrast-to-dark: _contrast-ratio($base-color, $dark-color);
     $-contrast-to-light: _contrast-ratio($base-color, $light-color);

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

@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 /// Generates an `@font-face` declaration. You can choose the specific file
-/// formats you need to output; the mixin supports `eot`, `ttf`, `svg`, `woff2`
+/// formats you need to output; the mixin supports `woff2`
 /// and `woff`. The mixin also supports usage with the Rails Asset Pipeline,
 /// which you can enable per use, or globally in the `$bourbon()` settings.
 ///
@@ -9,11 +9,11 @@
 ///
 /// @argument {string} $file-path
 ///
-/// @argument {string | list} $file-formats [("ttf", "woff2", "woff")]
+/// @argument {string | list} $file-formats [("woff2", "woff")]
 ///   List of the font file formats to include. Can also be set globally using
 ///   the `global-font-file-formats` key in the Bourbon settings.
 ///
-/// @argument {string} $asset-pipeline [false]
+/// @argument {boolean} $asset-pipeline [false]
 ///   Set to `true` if you’re using the Rails Asset Pipeline (place the fonts
 ///   in `app/assets/fonts/`). Can also be set globally using the
 ///   `rails-asset-pipeline` key in the Bourbon settings.

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

@@ -47,7 +47,7 @@
 @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`.";
+      "the `hide-visually` mixin. Must be either `hide` or `unhide`.";
   } @else if $toggle == "hide" {
     border: 0;
     clip: rect(1px, 1px, 1px, 1px);

data/core/bourbon/library/_overflow-wrap.scss

@@ -18,11 +18,8 @@
 ///     overflow-wrap: break-word;
 ///   }
 
-/* stylelint-disable order/properties-alphabetical-order */
-
 @mixin overflow-wrap($wrap: break-word) {
   word-wrap: $wrap;
+  // stylelint-disable-next-line order/properties-alphabetical-order
   overflow-wrap: $wrap;
 }
-
-/* stylelint-enable */

data/core/bourbon/library/_position.scss

@@ -46,10 +46,10 @@
 ) {
   $box-edge-values: _unpack-shorthand($box-edge-values);
   $offsets: (
-    top:    nth($box-edge-values, 1),
-    right:  nth($box-edge-values, 2),
-    bottom: nth($box-edge-values, 3),
-    left:   nth($box-edge-values, 4),
+    "top": nth($box-edge-values, 1),
+    "right": nth($box-edge-values, 2),
+    "bottom": nth($box-edge-values, 3),
+    "left": nth($box-edge-values, 4),
   );
 
   position: $position;

data/core/bourbon/library/_shade.scss

@@ -25,7 +25,7 @@
 ) {
   @if not _is-color($color) {
     @error "`#{$color}` is not a valid color for the `$color` argument in " +
-           "the `shade` mixin.";
+      "the `shade` mixin.";
   } @else {
     @return mix(#000, $color, $percent);
   }

data/core/bourbon/library/_size.scss

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

data/core/bourbon/library/_tint.scss

@@ -25,7 +25,7 @@
 ) {
   @if not _is-color($color) {
     @error "`#{$color}` is not a valid color for the `$color` argument in " +
-           "the `tint` mixin.";
+      "the `tint` mixin.";
   } @else {
     @return mix(#fff, $color, $percent);
   }

data/core/bourbon/library/_triangle.scss

@@ -44,10 +44,10 @@
     $direction
   ) {
     @error "Direction must be `up`, `up-right`, `right`, `down-right`, " +
-           "`down`, `down-left`, `left` or `up-left`.";
+      "`down`, `down-left`, `left` or `up-left`.";
   } @else if not _is-color($color) {
     @error "`#{$color}` is not a valid color for the `$color` argument in " +
-           "the `triangle` mixin.";
+      "the `triangle` mixin.";
   } @else {
     border-style: solid;
     height: 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/_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/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 = "6.0.0"
+  VERSION = "7.2.0"
 end