scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 13:13:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #904 from Zanz2/buttons_design_SCI-1809

Browse source 
Made scrolling possible at most zoom levels in protocols.io import preview [SCI-1809]
This commit is contained in:
Zanz2 2017-12-11 21:16:40 +01:00 committed by GitHub
commit 306ae51a4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/stylesheets/themes/scinote.scss
View file

@ -1274,14 +1274,10 @@ ul.content-module-activities {
}
}
// Import json protocols.io protocol modal
#modal-import-json-protocol-preview .modal-dialog {
width: 70%;
}
// Protocolsio Import protocol modal
.import-protocols-modal-preview-container-json {
height: 300px;
overflow-x: scroll;
overflow-y: scroll;
width: 100%;
@ -1301,6 +1297,25 @@ ul.content-module-activities {
}
}
// Protocolsio Preview protocol modal
@media (min-width: 768px) {
#modal-import-json-protocol-preview .modal-dialog {
width: 70%;
}
}
#modal-import-json-protocol-preview .modal-dialog {
.modal-body {
max-height: 75vh;
overflow-y: auto;
width: 100%;
.ql-editor {
min-height: initial;
}
}
}
/* Steps and Results */
#steps {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAABCAYAAACsXeyTAAAAIUlEQVQImWNgoD5gZGBgMILSjKRo/P//vwiSGQwMDAwMAEnaA0jgHoquAAAAAElFTkSuQmCC");

6
app/views/protocols/import_export/_import_json_protocol_preview_modal.html.erb
View file

@ -13,9 +13,9 @@
<div
id="modal-import-json-protocol-preview"
class="modal fade"
role="dialog"
tabindex="-1">
<div class="modal-dialog">
tabindex="-1"
role="dialog">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>

6
app/views/protocols/protocolsio_import_create.js.erb
View file

@ -18,5 +18,11 @@ HelperModule.flashAlertMsg(' <%= t('my_modules.protocols.load_from_file_invalid_
);
<% end %>
$('#modal-import-json-protocol-preview').modal('show');
$('.modal').on('hidden.bs.modal', function (e) {
if($('.modal').hasClass('in')) {
$('body').addClass('modal-open');
}
});
<% end %>