scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 17:51:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix item sidebar showing on full view of inventory [SCI-9525] (#6447)

Browse source
This commit is contained in:
ajugo 2023-10-16 10:18:22 +02:00 committed by GitHub
parent 57bfe0036b
commit 67008a54d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/application.js.erb
View file

@ -314,8 +314,14 @@ window.I18n = I18n;
// Multiple modal support // Multiple modal support
// https://stackoverflow.com/a/24914782 // https://stackoverflow.com/a/24914782
$(document).on('shown.bs.modal', '.modal', function() { $(document).on('shown.bs.modal', '.modal', function() {
const zIndex = 2040 + 10 * $('.modal:visible').length; let zIndex;
$(this).css('z-index', zIndex); if ($(this).hasClass('custom-z-index') ) {
zIndex = $(this).css('z-index');
} else {
zIndex = 2040 + 10 * $('.modal:visible').length;
$(this).css('z-index', zIndex);
}
setTimeout(() => $('.modal-backdrop').not('.modal-stack').css('z-index', zIndex - 1).addClass('modal-stack')); setTimeout(() => $('.modal-backdrop').not('.modal-stack').css('z-index', zIndex - 1).addClass('modal-stack'));
}); });

1
app/assets/stylesheets/my_modules/repositories.scss
View file

@ -155,7 +155,6 @@
#myModuleRepositoryFullViewModal { #myModuleRepositoryFullViewModal {
padding-left: 0 !important; padding-left: 0 !important;
z-index: 1045;
.modal-dialog { .modal-dialog {
height: 100vh; height: 100vh;

2
app/views/my_modules/repositories/_full_view_modal.html.erb
View file

@ -1,4 +1,4 @@
<div class="modal" id="myModuleRepositoryFullViewModal" data-keyboard="false" tabindex="-1" role="dialog"> <div class="modal custom-z-index" id="myModuleRepositoryFullViewModal" data-keyboard="false" tabindex="-1" role="dialog">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">