Skip to content

Commit

Permalink
Upgrade vendored Bootstrap as well
Browse files Browse the repository at this point in the history
Also removed theming functionality, since it is not compatible with Bootstrap 5
  • Loading branch information
mshibuya committed Jan 2, 2022
1 parent 73c7e5c commit 2fd05bc
Show file tree
Hide file tree
Showing 145 changed files with 15,250 additions and 11,701 deletions.
3 changes: 2 additions & 1 deletion app/assets/javascripts/rails_admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
//= require 'rails_admin/jquery-ui/widgets/autocomplete'
//= require 'rails_admin/moment-with-locales'
//= require 'rails_admin/bootstrap-datetimepicker'
//= require 'rails_admin/bootstrap/bootstrap'
//= require 'rails_admin/popper'
//= require 'rails_admin/bootstrap'

//= require 'rails_admin/filter-box'
//= require 'rails_admin/filtering-multiselect'
Expand Down
32 changes: 32 additions & 0 deletions app/assets/stylesheets/rails_admin.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
@charset "UTF-8";

/*** Variables ***/

@import "rails_admin/custom/variables";
@import "rails_admin/styles/base/variables";

/*** Mixins ***/

@import "rails_admin/styles/base/mixins";
@import "rails_admin/custom/mixins";

/*** Bootstrap ***/

$font-size-base: 0.85rem !default;
@import "rails_admin/bootstrap/bootstrap";

/*** Libraries ***/

//@import "rails_admin/bootstrap-datetimepicker-build";
@import "rails_admin/styles/filtering-select";
@import "rails_admin/styles/filtering-multiselect";
@import "rails_admin/styles/widgets";

/*** Font-awesome ***/

@import "rails_admin/font-awesome";

/*** RailsAdmin Theming ***/

@import "rails_admin/styles/base/theming";
@import "rails_admin/custom/theming";
76 changes: 0 additions & 76 deletions app/assets/stylesheets/rails_admin.scss.erb

This file was deleted.

Loading

0 comments on commit 2fd05bc

Please sign in to comment.