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

Upgrade Bootstrap to 5.3.3 #3409

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,12 @@ gem 'awesome_nested_set'
# as templating language
gem 'haml-rails'

# for stylesheets
gem 'sass-rails', '>= 4.0.2'

# as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'

# as the front-end framework
gem 'autoprefixer-rails'
gem 'bootstrap-sass', '~> 3.4.0'
gem 'sassc-rails'
gem 'bootstrap', '~> 5'
gem 'cocoon'

# as the JavaScript library
Expand Down Expand Up @@ -149,9 +146,6 @@ gem 'money-rails'
# for lists
gem 'acts_as_list'

# for switch checkboxes
gem 'bootstrap-switch-rails', '3.3.3' # Locked pending Bttstrp/bootstrap-switch#707

# for parsing OEmbed data
gem 'ruby-oembed'

Expand Down
14 changes: 6 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,9 @@ GEM
bcrypt (3.1.20)
bigdecimal (3.1.8)
bindex (0.8.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap-switch-rails (3.3.3)
bootstrap (5.3.3)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.8, < 3)
builder (3.2.4)
byebug (11.1.3)
cancancan (3.6.1)
Expand Down Expand Up @@ -368,6 +367,7 @@ GEM
ruby-rc4
ttfunk
pg (1.5.6)
popper_js (2.11.8)
prawn (2.5.0)
matrix (~> 0.4)
pdf-core (~> 0.10.0)
Expand Down Expand Up @@ -610,10 +610,8 @@ DEPENDENCIES
acts_as_commentable_with_threading
acts_as_list
ajax-datatables-rails
autoprefixer-rails
awesome_nested_set
bootstrap-sass (~> 3.4.0)
bootstrap-switch-rails (= 3.3.3)
bootstrap (~> 5)
byebug
cancancan
capybara
Expand Down Expand Up @@ -685,7 +683,7 @@ DEPENDENCIES
rubocop-rails
rubocop-rspec
ruby-oembed
sass-rails (>= 4.0.2)
sassc-rails
selectize-rails
sentry-rails
shoulda-matchers
Expand Down
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
//= require holderjs
//= require osem-datatables
//= require osem-tickets
//= require bootstrap-switch
//= require osem-schedule
//= require osem-switch
//= require osem-bootstrap
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*= require osem-fonts
*= require bootstrap-markdown
*= require leaflet
*= require bootstrap3-switch
*= require osem-payments
*= require osem-navbar
*= require selectize
Expand Down
55 changes: 1 addition & 54 deletions app/assets/stylesheets/strap-on.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,61 +5,8 @@ $navbar-default-color: #ffffff;
$navbar-default-link-color: #ffffff;
$navbar-default-link-hover-color: #000000;

@import "bootstrap-sprockets";

//
// Bootstrap components
//
// Core variables and mixins
@import "bootstrap/variables";
@import "bootstrap/mixins";

// Reset and dependencies
@import "bootstrap/normalize";
@import "bootstrap/print";
@import "bootstrap/glyphicons";

// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/grid";
@import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";

// Components
@import "bootstrap/component-animations";
@import "bootstrap/dropdowns";
@import "bootstrap/button-groups";
@import "bootstrap/input-groups";
@import "bootstrap/navs";
@import "bootstrap/navbar";
@import "bootstrap/breadcrumbs";
@import "bootstrap/pagination";
@import "bootstrap/pager";
@import "bootstrap/labels";
@import "bootstrap/badges";
@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
@import "bootstrap/alerts";
@import "bootstrap/progress-bars";
@import "bootstrap/media";
@import "bootstrap/list-group";
@import "bootstrap/panels";
@import "bootstrap/responsive-embed";
@import "bootstrap/wells";
@import "bootstrap/close";

// Components w/ JavaScript
@import "bootstrap/modals";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/carousel";

// Utility classes
@import "bootstrap/utilities";
@import "bootstrap/responsive-utilities";

// semantic classes
@import "osem-datatables";
@import "bootstrap";
Loading