From b3e2cc5826b458ef3b96612d6ef8537382230d4f Mon Sep 17 00:00:00 2001 From: Elaina Natario Date: Tue, 22 Feb 2022 09:47:23 -0500 Subject: [PATCH 01/11] Ran the SASS migration tool on division so deprecation warnings stop being thrown. (#1107) (#1110) Co-authored-by: Jarrett Lusso --- core/bourbon/library/_modular-scale.scss | 12 +++++++----- core/bourbon/library/_strip-unit.scss | 4 +++- core/bourbon/library/_triangle.scss | 8 ++++---- core/bourbon/utilities/_contrast-ratio.scss | 6 ++++-- core/bourbon/utilities/_gamma.scss | 6 ++++-- core/bourbon/utilities/_lightness.scss | 8 +++++--- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/core/bourbon/library/_modular-scale.scss b/core/bourbon/library/_modular-scale.scss index 81f2ab9a0..311ffde8e 100644 --- a/core/bourbon/library/_modular-scale.scss +++ b/core/bourbon/library/_modular-scale.scss @@ -67,6 +67,8 @@ /// /// @require {function} _fetch-bourbon-setting +@use "sass:math"; + @function modular-scale( $increment, $value: _fetch-bourbon-setting("modular-scale-base"), @@ -78,7 +80,7 @@ // scale $v2 to just above $v1 @while $v2 > $v1 { - $v2: ($v2 / $ratio); // will be off-by-1 + $v2: math.div($v2, $ratio); // will be off-by-1 } @while $v2 < $v1 { $v2: ($v2 * $ratio); // will fix off-by-1 @@ -102,15 +104,15 @@ @if $increment < 0 { // adjust $v2 to just below $v1 @if $double-stranded { - $v2: ($v2 / $ratio); + $v2: math.div($v2, $ratio); } @for $i from $increment through -1 { - @if $double-stranded and ($v1 / $ratio) < $v2 { + @if $double-stranded and math.div($v1, $ratio) < $v2 { $value: $v2; - $v2: ($v2 / $ratio); + $v2: math.div($v2, $ratio); } @else { - $v1: ($v1 / $ratio); + $v1: math.div($v1, $ratio); $value: $v1; } } diff --git a/core/bourbon/library/_strip-unit.scss b/core/bourbon/library/_strip-unit.scss index f4f660a35..b0e260d0d 100644 --- a/core/bourbon/library/_strip-unit.scss +++ b/core/bourbon/library/_strip-unit.scss @@ -12,6 +12,8 @@ /// // Output /// $dimension: 10; +@use "sass:math"; + @function strip-unit($value) { - @return ($value / ($value * 0 + 1)); + @return math.div($value, $value * 0 + 1); } diff --git a/core/bourbon/library/_triangle.scss b/core/bourbon/library/_triangle.scss index 6ed32a1c3..90e0bb8f0 100644 --- a/core/bourbon/library/_triangle.scss +++ b/core/bourbon/library/_triangle.scss @@ -55,25 +55,25 @@ @if $direction == "up" { border-color: transparent transparent $color; - border-width: 0 ($width / 2) $height; + border-width: 0 ($width * 0.5) $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; + border-width: ($height * 0.5) 0 ($height * 0.5) $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; + border-width: $height ($width * 0.5) 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; + border-width: ($height * 0.5) $width ($height * 0.5) 0; } @else if $direction == "up-left" { border-color: $color transparent transparent; border-width: $width $width 0 0; diff --git a/core/bourbon/utilities/_contrast-ratio.scss b/core/bourbon/utilities/_contrast-ratio.scss index 1ba65ce15..55d38d587 100644 --- a/core/bourbon/utilities/_contrast-ratio.scss +++ b/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); } } diff --git a/core/bourbon/utilities/_gamma.scss b/core/bourbon/utilities/_gamma.scss index 3e5145b12..ea570b0b3 100644 --- a/core/bourbon/utilities/_gamma.scss +++ b/core/bourbon/utilities/_gamma.scss @@ -10,11 +10,13 @@ /// /// @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; + $c: math.div($channel + 0.055, 1.055); @if function-exists("pow") { @return pow($c, 2.4); } @else { diff --git a/core/bourbon/utilities/_lightness.scss b/core/bourbon/utilities/_lightness.scss index a2929044b..998a29c31 100644 --- a/core/bourbon/utilities/_lightness.scss +++ b/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; } From 5202e43b8681305dd4f1d1d58e66672e865a078a Mon Sep 17 00:00:00 2001 From: Elaina Natario Date: Tue, 22 Feb 2022 10:25:06 -0500 Subject: [PATCH 02/11] update changelog and release (#1111) --- CHANGELOG.md | 8 +++++--- core/_bourbon.scss | 2 +- lib/bourbon/version.rb | 2 +- package.json | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8871fc48..aa74b3119 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,13 @@ 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.1.0] - 2022-02-22 -Nothing at the moment. +### Changed + +- Replace `/` with `math.div` per Dart Sass 2.0.0 updates. -[unreleased]: https://github.com/thoughtbot/bourbon/compare/v6.0.0...HEAD +[7.1.0]: https://github.com/thoughtbot/bourbon/compare/v7.0.0...v7.1.0 ## [7.0.0] - 2020-03-09 diff --git a/core/_bourbon.scss b/core/_bourbon.scss index cb541bb1c..f6f376e1b 100644 --- a/core/_bourbon.scss +++ b/core/_bourbon.scss @@ -1,4 +1,4 @@ -// Bourbon 7.0.0 +// Bourbon 7.1.0 // https://www.bourbon.io/ // Copyright 2011-2020 thoughtbot, inc. // MIT License diff --git a/lib/bourbon/version.rb b/lib/bourbon/version.rb index d3037d998..1accfdf51 100644 --- a/lib/bourbon/version.rb +++ b/lib/bourbon/version.rb @@ -1,3 +1,3 @@ module Bourbon - VERSION = "7.0.0" + VERSION = "7.1.0" end diff --git a/package.json b/package.json index a9eccec93..193ed8aca 100644 --- a/package.json +++ b/package.json @@ -37,5 +37,5 @@ "stylelint": "npx stylelint 'core/**/*.scss'", "test": "bundle exec rake" }, - "version": "7.0.0" + "version": "7.1.0" } From 589edd2307290cd0fd72f6082bc3ccb1752cb1b5 Mon Sep 17 00:00:00 2001 From: Stephen Lindberg Date: Tue, 22 Feb 2022 12:13:25 -0500 Subject: [PATCH 03/11] Revert "Ran the SASS migration tool on division so deprecation warnings stop being thrown. (#1107) (#1110)" This reverts commit b3e2cc5826b458ef3b96612d6ef8537382230d4f. --- core/bourbon/library/_modular-scale.scss | 12 +++++------- core/bourbon/library/_strip-unit.scss | 4 +--- core/bourbon/library/_triangle.scss | 8 ++++---- core/bourbon/utilities/_contrast-ratio.scss | 6 ++---- core/bourbon/utilities/_gamma.scss | 6 ++---- core/bourbon/utilities/_lightness.scss | 8 +++----- 6 files changed, 17 insertions(+), 27 deletions(-) diff --git a/core/bourbon/library/_modular-scale.scss b/core/bourbon/library/_modular-scale.scss index 311ffde8e..81f2ab9a0 100644 --- a/core/bourbon/library/_modular-scale.scss +++ b/core/bourbon/library/_modular-scale.scss @@ -67,8 +67,6 @@ /// /// @require {function} _fetch-bourbon-setting -@use "sass:math"; - @function modular-scale( $increment, $value: _fetch-bourbon-setting("modular-scale-base"), @@ -80,7 +78,7 @@ // scale $v2 to just above $v1 @while $v2 > $v1 { - $v2: math.div($v2, $ratio); // will be off-by-1 + $v2: ($v2 / $ratio); // will be off-by-1 } @while $v2 < $v1 { $v2: ($v2 * $ratio); // will fix off-by-1 @@ -104,15 +102,15 @@ @if $increment < 0 { // adjust $v2 to just below $v1 @if $double-stranded { - $v2: math.div($v2, $ratio); + $v2: ($v2 / $ratio); } @for $i from $increment through -1 { - @if $double-stranded and math.div($v1, $ratio) < $v2 { + @if $double-stranded and ($v1 / $ratio) < $v2 { $value: $v2; - $v2: math.div($v2, $ratio); + $v2: ($v2 / $ratio); } @else { - $v1: math.div($v1, $ratio); + $v1: ($v1 / $ratio); $value: $v1; } } diff --git a/core/bourbon/library/_strip-unit.scss b/core/bourbon/library/_strip-unit.scss index b0e260d0d..f4f660a35 100644 --- a/core/bourbon/library/_strip-unit.scss +++ b/core/bourbon/library/_strip-unit.scss @@ -12,8 +12,6 @@ /// // Output /// $dimension: 10; -@use "sass:math"; - @function strip-unit($value) { - @return math.div($value, $value * 0 + 1); + @return ($value / ($value * 0 + 1)); } diff --git a/core/bourbon/library/_triangle.scss b/core/bourbon/library/_triangle.scss index 90e0bb8f0..6ed32a1c3 100644 --- a/core/bourbon/library/_triangle.scss +++ b/core/bourbon/library/_triangle.scss @@ -55,25 +55,25 @@ @if $direction == "up" { border-color: transparent transparent $color; - border-width: 0 ($width * 0.5) $height; + 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 * 0.5) 0 ($height * 0.5) $width; + 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 * 0.5) 0; + 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 * 0.5) $width ($height * 0.5) 0; + border-width: ($height / 2) $width ($height / 2) 0; } @else if $direction == "up-left" { border-color: $color transparent transparent; border-width: $width $width 0 0; diff --git a/core/bourbon/utilities/_contrast-ratio.scss b/core/bourbon/utilities/_contrast-ratio.scss index 55d38d587..1ba65ce15 100644 --- a/core/bourbon/utilities/_contrast-ratio.scss +++ b/core/bourbon/utilities/_contrast-ratio.scss @@ -19,15 +19,13 @@ /// /// @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 math.div($-local-lightness-1, $-local-lightness-2); + @return $-local-lightness-1 / $-local-lightness-2; } @else { - @return math.div($-local-lightness-2, $-local-lightness-1); + @return $-local-lightness-2 / $-local-lightness-1; } } diff --git a/core/bourbon/utilities/_gamma.scss b/core/bourbon/utilities/_gamma.scss index ea570b0b3..3e5145b12 100644 --- a/core/bourbon/utilities/_gamma.scss +++ b/core/bourbon/utilities/_gamma.scss @@ -10,13 +10,11 @@ /// /// @access private -@use "sass:math"; - @function _gamma($channel) { @if $channel < 0.03928 { - @return math.div($channel, 12.92); + @return $channel / 12.92; } @else { - $c: math.div($channel + 0.055, 1.055); + $c: ($channel + 0.055) / 1.055; @if function-exists("pow") { @return pow($c, 2.4); } @else { diff --git a/core/bourbon/utilities/_lightness.scss b/core/bourbon/utilities/_lightness.scss index 998a29c31..a2929044b 100644 --- a/core/bourbon/utilities/_lightness.scss +++ b/core/bourbon/utilities/_lightness.scss @@ -11,16 +11,14 @@ /// /// @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(math.div($-local-red-raw, 255)); - $-local-green: _gamma(math.div($-local-green-raw, 255)); - $-local-blue: _gamma(math.div($-local-blue-raw, 255)); + $-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; } From 5af3b53f8c983d0ca634ff84a646ed083e9f9f73 Mon Sep 17 00:00:00 2001 From: Stephen Lindberg Date: Tue, 22 Feb 2022 12:17:05 -0500 Subject: [PATCH 04/11] 7.2.0 changelog --- CHANGELOG.md | 10 +++++++++- core/_bourbon.scss | 2 +- lib/bourbon/version.rb | 2 +- package.json | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa74b3119..e20f727af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,19 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org). +## [7.2.0] - 2022-02-22 + +### 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. +- 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 diff --git a/core/_bourbon.scss b/core/_bourbon.scss index f6f376e1b..7d207e95e 100644 --- a/core/_bourbon.scss +++ b/core/_bourbon.scss @@ -1,4 +1,4 @@ -// Bourbon 7.1.0 +// Bourbon 7.2.0 // https://www.bourbon.io/ // Copyright 2011-2020 thoughtbot, inc. // MIT License diff --git a/lib/bourbon/version.rb b/lib/bourbon/version.rb index 1accfdf51..22f78cf36 100644 --- a/lib/bourbon/version.rb +++ b/lib/bourbon/version.rb @@ -1,3 +1,3 @@ module Bourbon - VERSION = "7.1.0" + VERSION = "7.2.0" end diff --git a/package.json b/package.json index 193ed8aca..aaaf30d57 100644 --- a/package.json +++ b/package.json @@ -37,5 +37,5 @@ "stylelint": "npx stylelint 'core/**/*.scss'", "test": "bundle exec rake" }, - "version": "7.1.0" + "version": "7.2.0" } From e5832c13ec0d69ac818dd1a032b6bb5480bbef53 Mon Sep 17 00:00:00 2001 From: Neil Carvalho Date: Fri, 5 Aug 2022 19:56:42 -0300 Subject: [PATCH 05/11] Upgrade to Ruby 2.7 (#1113) * Update to Ruby latest 2.6 version As part of 2.7 upgrade, we want to update to the latest 2.6 Ruby version in order to see the latest deprecation warnings. This commit does this upgrade. * Upgrade Ruby to 2.7.6 As we didn't have any deprecation warning in the previous commit - which upgraded Ruby to the latest 2.6 version, it should be safe to upgrade it to 2.7. Future work needs to be done to address any new deprecation warning that arises with this upgrade. --- .circleci/config.yml | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e9b1b8919..93000ac11 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: circleci/ruby:2.6.5-node + - image: cimg/ruby:2.7.6-node steps: - checkout - restore_cache: diff --git a/.tool-versions b/.tool-versions index 91196966f..d75bec846 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -ruby 2.6.5 +ruby 2.7.6 nodejs 12.16.1 From 2ac23857d727a82cbc7ddacd87201bd3d13a8621 Mon Sep 17 00:00:00 2001 From: Jim Gay Date: Fri, 20 Jan 2023 12:27:04 -0500 Subject: [PATCH 06/11] Update CI image to ruby 2.7.7 (#1115) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 93000ac11..6f8768d59 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2 jobs: build: docker: - - image: cimg/ruby:2.7.6-node + - image: cimg/ruby:2.7.7-node steps: - checkout - restore_cache: From 8d9e435907bc75d1e44eaa53ecd02d8fc6c17f6f Mon Sep 17 00:00:00 2001 From: Eric Hayes Date: Fri, 20 Jan 2023 12:41:26 -0500 Subject: [PATCH 07/11] Compatibility with Rails 7 (#1109) --- lib/bourbon.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/bourbon.rb b/lib/bourbon.rb index 4339108e9..10474b0ae 100644 --- a/lib/bourbon.rb +++ b/lib/bourbon.rb @@ -3,7 +3,9 @@ module Bourbon if defined?(Rails) && defined?(Rails::Engine) class Engine < ::Rails::Engine - config.assets.paths << File.expand_path("../core", __dir__) + initializer "bourbon.paths", group: :all do |app| + app.config.assets.paths << File.expand_path("../core", __dir__) + end end else begin From 42459f6a39e5b158c638a7ce32ca081ccec63d1c Mon Sep 17 00:00:00 2001 From: Jim Gay Date: Fri, 20 Jan 2023 14:25:37 -0500 Subject: [PATCH 08/11] Run CI against a Ruby matrix (#1117) --- .circleci/config.yml | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f8768d59..17a4f92d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,17 @@ -version: 2 +version: 2.1 + +orbs: + # orbs are basically bundles of pre-written build scripts that work for common cases + # https://github.com/CircleCI-Public/ruby-orb + ruby: circleci/ruby@1.1 + jobs: - build: + test: + parameters: + ruby-version: + type: string docker: - - image: cimg/ruby:2.7.7-node + - image: cimg/ruby:<< parameters.ruby-version >>-node steps: - checkout - restore_cache: @@ -22,3 +31,12 @@ jobs: - run: name: Parse SassDoc comments command: npm run sassdoc +workflows: + build_and_test: + jobs: + - test: + matrix: + parameters: + # https://github.com/CircleCI-Public/cimg-ruby + # only supports the last three ruby versions + ruby-version: ["2.7", "3.0", "3.1", "3.2"] From c3551e46f41738681216a7f957bc88bc79155b16 Mon Sep 17 00:00:00 2001 From: Elisa Verna Date: Mon, 23 Jan 2023 14:16:25 -0600 Subject: [PATCH 09/11] Boubon v7.3.0 (#1118) --- .tool-versions | 2 -- CHANGELOG.md | 5 +++++ core/_bourbon.scss | 2 +- lib/bourbon/version.rb | 2 +- package.json | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) delete mode 100644 .tool-versions diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index d75bec846..000000000 --- a/.tool-versions +++ /dev/null @@ -1,2 +0,0 @@ -ruby 2.7.6 -nodejs 12.16.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index e20f727af..0369551be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org). +## [7.3.0] - 2023-01-20 + +## Changed +- Update initializers so they only include assets for >=Rails 5. [https://github.com/thoughtbot/bourbon/pull/1109/](https://github.com/thoughtbot/bourbon/pull/1109/files) + ## [7.2.0] - 2022-02-22 ### Changed diff --git a/core/_bourbon.scss b/core/_bourbon.scss index 7d207e95e..c36979356 100644 --- a/core/_bourbon.scss +++ b/core/_bourbon.scss @@ -1,4 +1,4 @@ -// Bourbon 7.2.0 +// Bourbon 7.3.0 // https://www.bourbon.io/ // Copyright 2011-2020 thoughtbot, inc. // MIT License diff --git a/lib/bourbon/version.rb b/lib/bourbon/version.rb index 22f78cf36..37ad7a584 100644 --- a/lib/bourbon/version.rb +++ b/lib/bourbon/version.rb @@ -1,3 +1,3 @@ module Bourbon - VERSION = "7.2.0" + VERSION = "7.3.0".freeze end diff --git a/package.json b/package.json index aaaf30d57..73e9182cd 100644 --- a/package.json +++ b/package.json @@ -37,5 +37,5 @@ "stylelint": "npx stylelint 'core/**/*.scss'", "test": "bundle exec rake" }, - "version": "7.2.0" + "version": "7.3.0" } From 71d4776757bbd0d7da47b5660eb6d1f3bf73fc3f Mon Sep 17 00:00:00 2001 From: Sarah Lima Date: Thu, 6 Jul 2023 10:07:00 -0300 Subject: [PATCH 10/11] Fix broken thoughtbot logo (#1119) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0494a6eb0..fb5f0b1d1 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,6 @@ We love open-source software! See [our other projects][community] or [hire us][hire] to design, develop, and grow your product. [thoughtbot]: https://thoughtbot.com?utm_source=github - [thoughtbot-logo]: http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg + [thoughtbot-logo]: https://thoughtbot.com/brand_assets/93:44.svg [community]: https://thoughtbot.com/community?utm_source=github [hire]: https://thoughtbot.com/hire-us?utm_source=github From 39283ea45adc88dfc8b5cdc6470f59a663057bbf Mon Sep 17 00:00:00 2001 From: Ragav Vasudevan <47608288+ragavindia@users.noreply.github.com> Date: Thu, 22 Feb 2024 03:08:56 +0530 Subject: [PATCH 11/11] s --- .hound.yml | 9 +-------- .stylelintrc.json | 3 --- LICENSE.md | 21 -------------------- eyeglass-exports.js | 7 ------- features/install.feature | 28 --------------------------- package.json | 41 ---------------------------------------- 6 files changed, 1 insertion(+), 108 deletions(-) delete mode 100644 .stylelintrc.json delete mode 100644 LICENSE.md delete mode 100644 eyeglass-exports.js delete mode 100644 features/install.feature delete mode 100644 package.json diff --git a/.hound.yml b/.hound.yml index b1b610c9d..2b376ab67 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,8 +1 @@ -ruby: - enabled: true -scss: - enabled: false -stylelint: - config_file: .stylelintrc.json - enabled: true - # version: 10.1.0 +CLEAR diff --git a/.stylelintrc.json b/.stylelintrc.json deleted file mode 100644 index 3171f405a..000000000 --- a/.stylelintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@thoughtbot/stylelint-config" -} diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 1ba822ca9..000000000 --- a/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -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 -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/eyeglass-exports.js b/eyeglass-exports.js deleted file mode 100644 index 33b3e8cd2..000000000 --- a/eyeglass-exports.js +++ /dev/null @@ -1,7 +0,0 @@ -var bourbon = require("./index"); - -module.exports = function(eyeglass, sass) { - return { - sassDir: bourbon.includePaths[0] - }; -}; diff --git a/features/install.feature b/features/install.feature deleted file mode 100644 index dca42f994..000000000 --- a/features/install.feature +++ /dev/null @@ -1,28 +0,0 @@ -Feature: Install bourbon files - - Scenario: Bourbon generates a new bourbon installation - When I run `bundle exec bourbon install` - Then the sass directories should have been generated - And the following directories should exist: - | bourbon | - And the master bourbon partial should have been generated - And the output should contain "Bourbon files installed to bourbon/" - - Scenario: Generating does not overwrite an existing bourbon directory - Given bourbon is already installed - When I run `bundle exec bourbon install` - Then the output should contain "Bourbon files already installed, doing nothing." - - Scenario: Install Bourbon into a custom path - When I run `bundle exec bourbon install --path=custom_path` - Then the sass directories with "custom_path" prefix should have been generated - And the following directories should exist: - | custom_path/bourbon | - And the master bourbon partial should have been generated within "custom_path" directory - And the output should contain "Bourbon files installed to custom_path/bourbon/" - - Scenario: Forcing install of bourbon - Given bourbon is already installed - When I run `bundle exec bourbon install --force` - Then the output from "bundle exec bourbon install --force" should contain "Bourbon files installed to bourbon/" - And the output should not contain "Bourbon files already installed, doing nothing." diff --git a/package.json b/package.json deleted file mode 100644 index 73e9182cd..000000000 --- a/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "author": { - "name": "thoughtbot", - "url": "http://thoughtbot.com" - }, - "bugs": { - "url": "https://github.com/thoughtbot/bourbon/issues" - }, - "description": "A lightweight Sass tool set.", - "devDependencies": { - "@thoughtbot/stylelint-config": "1.1.0", - "sassdoc": "^2.5.0", - "stylelint": "10.1.0" - }, - "eyeglass": { - "needs": "*", - "exports": "eyeglass-exports.js" - }, - "homepage": "https://www.bourbon.io/", - "keywords": [ - "css", - "eyeglass-module", - "mixins", - "sass", - "scss" - ], - "license": "MIT", - "main": "index.js", - "style": "core/_bourbon.scss", - "name": "bourbon", - "repository": { - "type": "git", - "url": "https://github.com/thoughtbot/bourbon.git" - }, - "scripts": { - "sassdoc": "npx sassdoc core/ --parse --verbose --strict", - "stylelint": "npx stylelint 'core/**/*.scss'", - "test": "bundle exec rake" - }, - "version": "7.3.0" -}