diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js index f59a49a23..a6a50a29f 100644 --- a/app/assets/javascripts/my_modules/protocols.js +++ b/app/assets/javascripts/my_modules/protocols.js @@ -38,19 +38,19 @@ function initEditProtocolDescription() { function initLinkUpdate() { var modal = $('#confirm-link-update-modal'); var modalTitle = modal.find('.modal-title'); - var modalBody = modal.find('.modal-body'); + var modalMessage = modal.find('.modal-body .message'); var updateBtn = modal.find(".modal-footer [data-action='submit']"); $("[data-action='unlink'], [data-action='revert'], [data-action='update-parent'], [data-action='update-self']") .on('ajax:success', function(e, data) { modalTitle.html(data.title); - modalBody.html(data.message); + modalMessage.html(data.message); updateBtn.text(data.btn_text); modal.attr('data-url', data.url); modal.modal('show'); }); modal.on('hidden.bs.modal', function() { - modalBody.html(''); + modalMessage.html(''); }); if (!$._data(updateBtn[0], 'events')) { diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 9f03457f0..1a2a286ea 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -670,8 +670,14 @@ margin-left: 4px; } -#confirm-link-update-modal { +#confirm-link-update-modal, +.delete-steps-modal { + .modal-body p { + margin: 1.2em 0; + } + .warning { - margin: 0 15px 15px; + font-weight: bold; + margin-bottom: 1.2em; } } diff --git a/app/javascript/vue/protocol/modals/delete_steps.vue b/app/javascript/vue/protocol/modals/delete_steps.vue index cdc7e2a0b..9374eb819 100644 --- a/app/javascript/vue/protocol/modals/delete_steps.vue +++ b/app/javascript/vue/protocol/modals/delete_steps.vue @@ -10,8 +10,7 @@
{{ i18n.t('protocols.steps.modals.delete_steps.description_1')}}
-{{ i18n.t('protocols.steps.modals.delete_steps.description_2')}}
- +{{ i18n.t('protocols.steps.modals.delete_steps.description_2')}}
<%= t('my_modules.protocols.confirm_link_update_modal.warning') %>
+