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

Bootstrap5 #1893

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
Draft
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
9 changes: 6 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ gem 'faker', '> 1.5.0'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0.4'
# Dependencies for CMS Assets Framework
gem 'bootstrap-sass', '~> 3.4.1'
# gem 'bootstrap-sass', '~> 3.4.1'
gem 'bootstrap', '~> 5.3.3'
gem 'dartsass-sprockets'

gem 'font-awesome-sass', '~> 5.0.13'
gem 'jquery-rails', '~> 4.4.0'
gem 'jquery-rails'
# TODO: remove or use gem
gem 'jquery-ui-rails', git: 'https://github.com/jquery-ui-rails/jquery-ui-rails', tag: 'v7.0.0'

Expand All @@ -41,7 +44,7 @@ gem 'uglifier', '>= 1.3.0'
# Bake the best breadcrumbs
gem 'breadcrumbs_on_rails'
# Help our forms
gem 'bootstrap_form', '~> 2.7.0'
gem 'bootstrap_form', '~> 2.7'
gem 'jasny-bootstrap-rails'
gem 'nested_form'

Expand Down
73 changes: 46 additions & 27 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ GEM
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.6)
public_suffix (>= 2.0.2, < 6.0)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
ansi (1.5.0)
ast (2.4.2)
autoprefixer-rails (10.4.7.0)
autoprefixer-rails (10.4.19.0)
execjs (~> 2)
axe-core-api (4.5.1)
dumb_delegator
Expand All @@ -102,13 +102,15 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
base64 (0.2.0)
bcrypt (3.1.20)
bigdecimal (3.1.8)
bindex (0.8.1)
bootsnap (1.15.0)
msgpack (~> 1.2)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap (5.3.3)
autoprefixer-rails (>= 9.1.0)
popper_js (>= 2.11.8, < 3)
bootstrap_form (2.7.0)
breadcrumbs_on_rails (4.1.0)
railties (>= 5.0)
Expand All @@ -119,11 +121,11 @@ GEM
thor (~> 1.0)
byebug (11.1.3)
cancancan (3.4.0)
capybara (3.38.0)
capybara (3.40.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
nokogiri (~> 1.11)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
Expand Down Expand Up @@ -158,7 +160,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.3.3)
concurrent-ruby (1.3.4)
cqm-models (4.2.0)
cqm-parsers (4.1.1.0)
activesupport (> 5.0)
Expand Down Expand Up @@ -225,6 +227,12 @@ GEM
webrick (~> 1.7)
cucumber-tag-expressions (4.1.0)
daemons (1.4.1)
dartsass-sprockets (3.1.0)
railties (>= 4.0.0)
sassc-embedded (~> 1.69)
sprockets (> 3.0)
sprockets-rails
tilt
database_cleaner-core (2.0.1)
database_cleaner-mongoid (2.0.1)
database_cleaner-core (~> 2.0.0)
Expand Down Expand Up @@ -254,7 +262,7 @@ GEM
domain_name (0.5.20190701)
unf (>= 0.0.5, < 1.0.0)
dumb_delegator (1.0.0)
erubi (1.12.0)
erubi (1.13.0)
erubis (2.7.0)
ethon (0.16.0)
ffi (>= 1.15.0)
Expand All @@ -271,11 +279,14 @@ GEM
sassc (>= 1.11)
globalid (1.2.1)
activesupport (>= 6.1)
google-protobuf (4.28.2)
bigdecimal
rake (>= 13)
hashdiff (1.0.1)
highline (1.7.10)
http-cookie (1.0.5)
domain_name (~> 0.5)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
image_processing (1.12.2)
Expand All @@ -292,7 +303,7 @@ GEM
jquery-rails
railties (>= 3.1)
sass-rails
jquery-rails (4.4.0)
jquery-rails (4.6.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
Expand All @@ -309,6 +320,7 @@ GEM
rb-inotify (~> 0.9, >= 0.9.10)
local_time (2.0.1)
log4r (1.1.10)
logger (1.6.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -329,7 +341,7 @@ GEM
mini_magick (4.12.0)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.23.1)
minitest (5.25.1)
minitest-rails (7.0.0)
minitest (~> 5.10)
railties (~> 7.0.0)
Expand Down Expand Up @@ -369,7 +381,7 @@ GEM
netrc (0.11.0)
newrelic_rpm (8.15.0)
nio4r (2.7.3)
nokogiri (1.16.5)
nokogiri (1.16.7)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
orm_adapter (0.5.0)
Expand All @@ -385,13 +397,14 @@ GEM
capybara (>= 2.1, < 4)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
popper_js (2.11.8)
pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-nav (1.0.0)
pry (>= 0.9.10, < 0.15)
public_suffix (5.0.5)
racc (1.8.0)
public_suffix (6.0.1)
racc (1.8.1)
rack (2.2.9)
rack-test (2.1.0)
rack (>= 1.3)
Expand Down Expand Up @@ -442,7 +455,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
regexp_parser (2.6.1)
regexp_parser (2.9.2)
remotipart (1.4.4)
representable (3.0.4)
declarative (< 0.1.0)
Expand All @@ -456,8 +469,7 @@ GEM
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.3.3)
strscan
rexml (3.3.7)
roar (1.1.1)
representable (~> 3.0)
roar-rails (1.1.0)
Expand Down Expand Up @@ -490,6 +502,9 @@ GEM
rubyzip (1.3.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-embedded (1.79.1)
google-protobuf (~> 4.27)
rake (>= 13)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -501,9 +516,13 @@ GEM
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
sassc-embedded (1.78.0)
sass-embedded (~> 1.78)
scss_lint (0.59.0)
sass (~> 3.5, >= 3.5.5)
selenium-webdriver (4.7.1)
selenium-webdriver (4.25.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand All @@ -525,15 +544,14 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
ssrf_filter (1.1.2)
strscan (3.1.0)
sys-uname (1.2.2)
ffi (~> 1.1)
systemu (2.6.5)
telephone_number (1.4.19)
test_xml (0.1.8)
diffy (~> 3.0)
nokogiri (>= 1.3.2)
thor (1.3.1)
thor (1.3.2)
thread_safe (0.3.6)
tilt (2.0.11)
timeout (0.4.1)
Expand Down Expand Up @@ -577,13 +595,13 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.7.0)
websocket (1.2.9)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.15)
zeitwerk (2.6.18)
zip-zip (0.3)
rubyzip (>= 1.0.0)

Expand All @@ -594,8 +612,8 @@ DEPENDENCIES
axe-core-capybara
axe-core-cucumber
bootsnap
bootstrap-sass (~> 3.4.1)
bootstrap_form (~> 2.7.0)
bootstrap (~> 5.3.3)
bootstrap_form (~> 2.7)
breadcrumbs_on_rails
bson
bundler-audit
Expand All @@ -612,6 +630,7 @@ DEPENDENCIES
cqm-validators (~> 4.0.5)
cucumber-rails
daemons
dartsass-sprockets
database_cleaner-mongoid
delayed_job_mongoid (~> 3.0.0)
devise
Expand All @@ -622,7 +641,7 @@ DEPENDENCIES
jasny-bootstrap-rails
jbuilder (~> 2.11.0)
jquery-datatables-rails
jquery-rails (~> 4.4.0)
jquery-rails
jquery-ui-rails!
kaminari-mongoid
launchy
Expand Down
10 changes: 2 additions & 8 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,6 @@
//= require dataTables/jquery.dataTables
//= require jquery-ui/widgets/autocomplete
//= require jquery-ui/widgets/tabs
//= require bootstrap/transition
//= require bootstrap/modal
//= require bootstrap/alert
//= require bootstrap/tab
//= require bootstrap/tooltip
//= require bootstrap/popover
//= require bootstrap/collapse
//= require bootstrap/dropdown
//= require jquery-ui/widgets/accordion
//= require jquery-ui/widgets/button
//= require jquery-ui/widgets/dialog
Expand All @@ -32,6 +24,8 @@
//= require jasny-bootstrap.min
//= require local-time
//= require_tree .
//= require popper
//= require bootstrap-sprockets

// will cover turbolinks changes (ajax already covered by rails ujs)
// this is necessary for CSRF tokens in changed form elements
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/test_executions.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var initializeTestExecutionResults = function() {
});

// enable each error popover
$('.error-popup-btn').popover();
//$('.error-popup-btn').popover();

/* change 'view' and 'hide' text for popover buttons */
$('.error-popup-btn').on('show.bs.popover', function () {
Expand Down
52 changes: 52 additions & 0 deletions app/assets/stylesheets/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@import "bootstrap/mixins/banner";
@include bsBanner("");


// scss-docs-start import-stack
// Configuration
@import "bootstrap/functions";
@import 'variables';
@import 'variables-dark';
@import "bootstrap/maps";
@import "bootstrap/mixins";
@import "bootstrap/utilities";

// Layout & components
@import "bootstrap/root";
@import "bootstrap/reboot";
@import "bootstrap/type";
@import "bootstrap/images";
@import "bootstrap/containers";
@import "bootstrap/grid";
@import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";
@import "bootstrap/transitions";
@import "bootstrap/dropdown";
@import "bootstrap/button-group";
@import "bootstrap/nav";
@import "bootstrap/navbar";
@import "bootstrap/card";
@import "bootstrap/accordion";
@import "bootstrap/breadcrumb";
@import "bootstrap/pagination";
@import "bootstrap/badge";
@import "bootstrap/alert";
@import "bootstrap/progress";
@import "bootstrap/list-group";
@import "bootstrap/close";
@import "bootstrap/toasts";
@import "bootstrap/modal";
@import "bootstrap/tooltip";
@import "bootstrap/popover";
@import "bootstrap/carousel";
@import "bootstrap/spinners";
@import "bootstrap/offcanvas";
@import "bootstrap/placeholders";

// Helpers
@import "bootstrap/helpers";

// Utilities
@import "bootstrap/utilities/api";
// scss-docs-end import-stack
8 changes: 3 additions & 5 deletions app/assets/stylesheets/_globals.scss
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
@import 'bootstrap-sprockets';
@import 'bootstrap-variables';
@import 'bootstrap';
@import 'font-awesome-sprockets';
@import 'font-awesome';

// Turbolinks progress bar
#cypress::before {
background-color: $brand-primary-highlight;
background-color: $primary;
height: 6px;
}

// Mixins
@mixin hidden-cell() {
// we want visually reduce the appearance, but it's ok to reveal to screen readers
color: $gray-light;
color: $gray-300;
border: 0;
}

@mixin hidden-header-cell() {
color: $gray-light;
color: $gray-300;
border-bottom: 0;
}
Loading
Loading