Skip to content

Commit

Permalink
Upgrade to bootstrap 5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
gravitystorm committed Sep 29, 2023
1 parent 5dbdb5a commit 520cffa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 20 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem "pg"
# Use SCSS for stylesheets
gem "dartsass-sprockets"
# Pin the dependentent sass-embedded to avoid deprecation warnings in bootstrap
gem "sass-embedded", "~> 1.55.0"
gem "sass-embedded", "~> 1.64.0"

# Use Terser as compressor for JavaScript assets
gem "terser"
Expand Down Expand Up @@ -45,7 +45,7 @@ gem "sprockets-exporters_pack"
gem "actionpack-page_caching", ">= 1.2.0"
gem "activerecord-import"
gem "active_record_union"
gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_1_3"
gem "bootstrap", :github => "gravitystorm/bootstrap-rubygem", :branch => "dartsass_5_2_3"
gem "bootstrap_form", "~> 5.0"
gem "cancancan"
gem "composite_primary_keys", "~> 14.0.0"
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
GIT
remote: https://github.com/gravitystorm/bootstrap-rubygem.git
revision: 8c48a63412e0ef1a280b95ef5344667be92d374a
branch: dartsass_5_1_3
revision: 7bd2caa8a2897a55892915a789d4e020906adb60
branch: dartsass_5_2_3
specs:
bootstrap (5.1.3)
bootstrap (5.2.3)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.9.3, < 3)
popper_js (>= 2.11.6, < 3)

GEM
remote: https://rubygems.org/
Expand Down Expand Up @@ -488,9 +488,9 @@ GEM
sanitize (6.1.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
sass-embedded (1.55.0)
google-protobuf (~> 3.19)
rake (>= 10.0.0)
sass-embedded (1.64.2)
google-protobuf (~> 3.23)
rake (>= 13.0.0)
secure_headers (6.5.0)
selenium-webdriver (4.13.1)
rexml (~> 3.2, >= 3.2.5)
Expand Down Expand Up @@ -629,7 +629,7 @@ DEPENDENCIES
rubocop-rails
rubocop-rake
sanitize
sass-embedded (~> 1.55.0)
sass-embedded (~> 1.64.0)
secure_headers
selenium-webdriver
simplecov
Expand Down
10 changes: 0 additions & 10 deletions app/assets/stylesheets/parameters.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,3 @@ $link-hover-decoration: underline;
$table-striped-bg: $offwhite;

$enable-negative-margins: true;

// Workaround for a dartsass bug with bootstrap 5.1
// This can be removed after upgrading to bootstrap 5.2
// This copies definitions straight from bootstrap, but uses the sass-native
// version of the subtract function.
$border-width: 1px;
$border-radius: .25rem;
$card-border-radius: $border-radius;
$card-border-width: $border-width;
$card-inner-border-radius: subtract($card-border-radius, $card-border-width);

0 comments on commit 520cffa

Please sign in to comment.