diff --git a/.dassie/Gemfile b/.dassie/Gemfile index c184f15fec..55b67fa01a 100644 --- a/.dassie/Gemfile +++ b/.dassie/Gemfile @@ -9,7 +9,8 @@ end git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'bootsnap', '>= 1.1.0', require: false -gem 'bootstrap', '~> 4.0' +gem 'bootstrap', '~> 5.3' +gem 'browse-everything', github: 'samvera/browse-everything', branch: '2.x-stable-dlp' gem 'coffee-rails', '~> 4.2' gem 'dalli' gem 'devise' diff --git a/.dassie/app/assets/javascripts/application.js b/.dassie/app/assets/javascripts/application.js index 813a066cd0..186f46b1c3 100644 --- a/.dassie/app/assets/javascripts/application.js +++ b/.dassie/app/assets/javascripts/application.js @@ -21,7 +21,8 @@ //= require twitter/typeahead //= require bootstrap //= require jquery.dataTables -//= require dataTables.bootstrap4 +//= require dataTables +//= require dataTables.bootstrap5 //= require blacklight/blacklight //= require blacklight_gallery diff --git a/.dassie/app/assets/stylesheets/application.css b/.dassie/app/assets/stylesheets/application.css index 719cf85ac5..eb664194dd 100644 --- a/.dassie/app/assets/stylesheets/application.css +++ b/.dassie/app/assets/stylesheets/application.css @@ -11,6 +11,6 @@ * It is generally better to create a new file per style scope. * *= require_tree . - *= require dataTables.bootstrap4 + *= require dataTables.bootstrap5 *= require_self */ diff --git a/.koppie/Gemfile b/.koppie/Gemfile index 8d14016f5a..7216ca8c31 100644 --- a/.koppie/Gemfile +++ b/.koppie/Gemfile @@ -9,7 +9,8 @@ end git_source(:github) { |repo| "https://github.com/#{repo}.git" } gem 'bootsnap', '>= 1.1.0', require: false -gem 'bootstrap', '~> 4.0' +gem 'bootstrap', '~> 5.3' +gem 'browse-everything', github: 'samvera/browse-everything', branch: '2.x-stable-dlp' gem 'coffee-rails', '~> 4.2' gem 'dalli' gem 'devise' @@ -39,6 +40,7 @@ gem 'turbolinks', '~> 5' gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript' gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'uglifier', '>= 1.3.0' +gem 'valkyrie', github: 'samvera/valkyrie', branch: 'main' group :development do gem 'better_errors' # add command line in browser when errors diff --git a/.koppie/app/assets/javascripts/application.js b/.koppie/app/assets/javascripts/application.js index 813a066cd0..186f46b1c3 100644 --- a/.koppie/app/assets/javascripts/application.js +++ b/.koppie/app/assets/javascripts/application.js @@ -21,7 +21,8 @@ //= require twitter/typeahead //= require bootstrap //= require jquery.dataTables -//= require dataTables.bootstrap4 +//= require dataTables +//= require dataTables.bootstrap5 //= require blacklight/blacklight //= require blacklight_gallery diff --git a/.koppie/app/assets/stylesheets/application.css b/.koppie/app/assets/stylesheets/application.css index 05d22a482b..0c11eb4d9c 100644 --- a/.koppie/app/assets/stylesheets/application.css +++ b/.koppie/app/assets/stylesheets/application.css @@ -11,7 +11,7 @@ * It is generally better to create a new file per style scope. * *= require_tree . - *= require dataTables.bootstrap4 + *= require dataTables.bootstrap5 *= require_self */ diff --git a/app/assets/stylesheets/hyrax/_badge.scss b/app/assets/stylesheets/hyrax/_badge.scss index de14c67519..2046a66dc0 100644 --- a/app/assets/stylesheets/hyrax/_badge.scss +++ b/app/assets/stylesheets/hyrax/_badge.scss @@ -1,7 +1,7 @@ .badge-enabled { - @extend .badge-success; + @extend .bg-success; } .badge-disabled { - @extend .badge-secondary; + @extend .bg-secondary; } diff --git a/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss b/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss index 1e44677197..1c8608f3ca 100644 --- a/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss +++ b/app/assets/stylesheets/hyrax/_browse_everything_overrides.scss @@ -1,4 +1,4 @@ -@import "browse_everything/browse_everything_bootstrap4"; + #browse-everything { top: 10%; diff --git a/app/assets/stylesheets/hyrax/_featured.scss b/app/assets/stylesheets/hyrax/_featured.scss index 04cfb03b7f..cbaad4d0e4 100644 --- a/app/assets/stylesheets/hyrax/_featured.scss +++ b/app/assets/stylesheets/hyrax/_featured.scss @@ -27,7 +27,7 @@ ol#featured_works { } .main { - padding: $custom-select-padding-y-sm; + padding: $form-select-padding-y-sm; } .featured-label { diff --git a/app/assets/stylesheets/hyrax/_form.scss b/app/assets/stylesheets/hyrax/_form.scss index 71740cbf69..8ae2e9ee97 100644 --- a/app/assets/stylesheets/hyrax/_form.scss +++ b/app/assets/stylesheets/hyrax/_form.scss @@ -13,8 +13,8 @@ td.status { span { @extend .badge; - &.on { @extend .badge-success; } - &.off { @extend .badge-secondary; } + &.on { @extend .bg-success; } + &.off { @extend .bg-secondary; } } } diff --git a/app/assets/stylesheets/hyrax/_home-page.scss b/app/assets/stylesheets/hyrax/_home-page.scss index 36a9aa6416..784c352b8f 100644 --- a/app/assets/stylesheets/hyrax/_home-page.scss +++ b/app/assets/stylesheets/hyrax/_home-page.scss @@ -8,7 +8,7 @@ } .image-masthead { - border-bottom: 1px solid $nav-divider-color; + border-bottom: 1px solid $gray-200; margin-bottom: $navbar-padding-y * 2.5; position: relative; diff --git a/app/assets/stylesheets/hyrax/_nestable.scss b/app/assets/stylesheets/hyrax/_nestable.scss index 099d1d2053..60282ca105 100644 --- a/app/assets/stylesheets/hyrax/_nestable.scss +++ b/app/assets/stylesheets/hyrax/_nestable.scss @@ -32,9 +32,9 @@ tr.dd-item { .dd-handle { display: block; height: 100%; margin: 5px 0; padding: 5px 10px; color: #333; text-decoration: none; font-weight: bold; border: 1px solid #ccc; background: #fafafa; - background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%); - background: -moz-linear-gradient(top, #fafafa 0%, #eee 100%); - background: linear-gradient(top, #fafafa 0%, #eee 100%); + background: -webkit-linear-gradient(to bottom, #fafafa 0%, #eee 100%); + background: -moz-linear-gradient(to bottom, #fafafa 0%, #eee 100%); + background: linear-gradient(to bottom, #fafafa 0%, #eee 100%); -webkit-border-radius: 3px; border-radius: 3px; box-sizing: border-box; -moz-box-sizing: border-box; @@ -80,8 +80,8 @@ tr.dd-item { .dd3-content { display: block; margin: 5px 0; padding: 0 0 0 30px; background: #fafafa; - background: -webkit-linear-gradient(top, #fafafa 0%, #eee 100%); - background: -moz-linear-gradient(top, #fafafa 0%, #eee 100%); + background: -webkit-linear-gradient(to bottom, #fafafa 0%, #eee 100%); + background: -moz-linear-gradient(to bottom, #fafafa 0%, #eee 100%); background: linear-gradient(to bottom, #fafafa 0%, #eee 100%); -webkit-border-radius: 3px; border-radius: 3px; @@ -101,8 +101,8 @@ tr.dd-item { white-space: nowrap; overflow: hidden; border: 1px solid #aaa; background: #ddd; - background: -webkit-linear-gradient(top, #ddd 0%, #bbb 100%); - background: -moz-linear-gradient(top, #ddd 0%, #bbb 100%); + background: -webkit-linear-gradient(to bottom, #ddd 0%, #bbb 100%); + background: -moz-linear-gradient(to bottom, #ddd 0%, #bbb 100%); background: -o-linear-gradient(to bottom, #ddd 0%, #bbb 100%); background: linear-gradient(to bottom, #ddd 0%, #bbb 100%); border-top-right-radius: 0; diff --git a/app/assets/stylesheets/hyrax/_work-show.scss b/app/assets/stylesheets/hyrax/_work-show.scss index 3d6235ac33..7030ae3058 100644 --- a/app/assets/stylesheets/hyrax/_work-show.scss +++ b/app/assets/stylesheets/hyrax/_work-show.scss @@ -75,8 +75,8 @@ ul.tabular { // Button row which sits below the title, and above panel content for a page .button-row-top-two-column { - margin-bottom: $btn-block-spacing-y; - margin-top: $btn-block-spacing-y; + margin-bottom: 0.5rem; + margin-top: 0.5rem; @media screen and (max-width: 767px) { > div { diff --git a/app/assets/stylesheets/hyrax/dashboard.scss b/app/assets/stylesheets/hyrax/dashboard.scss index 2b60afdeba..474d250ecd 100644 --- a/app/assets/stylesheets/hyrax/dashboard.scss +++ b/app/assets/stylesheets/hyrax/dashboard.scss @@ -64,12 +64,12 @@ body.dashboard { h1 { font-size: $h2-font-size; - margin-left: $table-cell-padding-sm; + margin-left: $table-cell-padding-x-sm; margin-top: $input-btn-padding-y; .fa { color: $gray; - margin-right: $table-cell-padding-sm; + margin-right: $table-cell-padding-x-sm; } } diff --git a/app/assets/stylesheets/hyrax/sidebar.scss b/app/assets/stylesheets/hyrax/sidebar.scss index ed88fac9b4..d9b9df326f 100644 --- a/app/assets/stylesheets/hyrax/sidebar.scss +++ b/app/assets/stylesheets/hyrax/sidebar.scss @@ -1,5 +1,5 @@ -$drawer-small: 40px; -$drawer-large: 260px; +$drawer-small: 2.5rem; +$drawer-large: 16.25rem; $gutter-width: $grid-gutter-width/2; .main-content { diff --git a/app/views/_flash_msg.html.erb b/app/views/_flash_msg.html.erb index c53d103dbb..8690ebfc3e 100644 --- a/app/views/_flash_msg.html.erb +++ b/app/views/_flash_msg.html.erb @@ -1,7 +1,7 @@ <% { notice: 'alert-success', error: 'alert-danger', alert: 'alert-warning' }.each do |type, flash_dom_class| %> <% if flash[type].present? %> <% flash.delete(type) %> diff --git a/app/views/_masthead.html.erb b/app/views/_masthead.html.erb index 8f136d1e01..95f806a990 100644 --- a/app/views/_masthead.html.erb +++ b/app/views/_masthead.html.erb @@ -1,12 +1,14 @@
diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb index deec22c0d4..65628ee9e2 100644 --- a/app/views/_user_util_links.html.erb +++ b/app/views/_user_util_links.html.erb @@ -5,7 +5,7 @@ <%= render_notifications(user: current_user) %>
  • -