diff --git a/app/assets/stylesheets/hyrax/_file_upload.scss b/app/assets/stylesheets/hyrax/_file_upload.scss index 24308e1d2a..d6bbd24b0d 100644 --- a/app/assets/stylesheets/hyrax/_file_upload.scss +++ b/app/assets/stylesheets/hyrax/_file_upload.scss @@ -34,3 +34,9 @@ padding-bottom: 10px; } } + +// fix blueimp jQuery-File-Upload display problems under Bootstrap 4+ +// found here: https://stackoverflow.com/a/48162651 +.fade.in { + opacity: 1 +} diff --git a/app/views/hyrax/uploads/_js_templates.html.erb b/app/views/hyrax/uploads/_js_templates.html.erb index ac9cd528b0..57558d1e3d 100644 --- a/app/views/hyrax/uploads/_js_templates.html.erb +++ b/app/views/hyrax/uploads/_js_templates.html.erb @@ -1,20 +1,20 @@ -<% fade_class_if_not_test = Rails.env.test? ? 'show' : 'fade show' %> +<% fade_class_if_not_test = Rails.env.test? ? '' : 'fade' %> diff --git a/app/views/hyrax/uploads/_js_templates_branding.html.erb b/app/views/hyrax/uploads/_js_templates_branding.html.erb index 0f6e94ca01..858f2221bb 100644 --- a/app/views/hyrax/uploads/_js_templates_branding.html.erb +++ b/app/views/hyrax/uploads/_js_templates_branding.html.erb @@ -1,7 +1,7 @@