Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RR1 #1124

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

RR1 #1124

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 21 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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: circleci/ruby:2.6.5-node
- image: cimg/ruby:<< parameters.ruby-version >>-node
steps:
- checkout
- restore_cache:
Expand All @@ -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"]
9 changes: 1 addition & 8 deletions .hound.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
ruby:
enabled: true
scss:
enabled: false
stylelint:
config_file: .stylelintrc.json
enabled: true
# version: 10.1.0
CLEAR
3 changes: 0 additions & 3 deletions .stylelintrc.json

This file was deleted.

2 changes: 0 additions & 2 deletions .tool-versions

This file was deleted.

21 changes: 18 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,26 @@
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.3.0] - 2023-01-20

Nothing at the moment.
## 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

- 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.

[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

Expand Down
21 changes: 0 additions & 21 deletions LICENSE.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion core/_bourbon.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Bourbon 7.0.0
// Bourbon 7.3.0
// https://www.bourbon.io/
// Copyright 2011-2020 thoughtbot, inc.
// MIT License
Expand Down
7 changes: 0 additions & 7 deletions eyeglass-exports.js

This file was deleted.

28 changes: 0 additions & 28 deletions features/install.feature

This file was deleted.

4 changes: 3 additions & 1 deletion lib/bourbon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/bourbon/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Bourbon
VERSION = "7.0.0"
VERSION = "7.3.0".freeze
end
41 changes: 0 additions & 41 deletions package.json

This file was deleted.