diff --git a/src/instanceMethods/buttons-handlers.js b/src/instanceMethods/buttons-handlers.js index 15c8dc753..6cb902c37 100644 --- a/src/instanceMethods/buttons-handlers.js +++ b/src/instanceMethods/buttons-handlers.js @@ -100,7 +100,7 @@ const confirm = (instance, value) => { const innerParams = privateProps.innerParams.get(instance || this) if (innerParams.showLoaderOnConfirm) { - showLoading() // TODO: make showLoading an *instance* method + showLoading() } if (innerParams.preConfirm) { diff --git a/src/scss/_toasts.scss b/src/scss/_toasts.scss index e23708e08..9af0d4946 100644 --- a/src/scss/_toasts.scss +++ b/src/scss/_toasts.scss @@ -114,8 +114,8 @@ justify-content: flex-start; height: auto; margin: 0; - margin-top: .3125em; - padding: 0; + margin-top: .5em; + padding: 0 .5em; } .swal2-styled { diff --git a/src/staticMethods/bindClickHandler.js b/src/staticMethods/bindClickHandler.js index 49ccd9b43..c03177b54 100644 --- a/src/staticMethods/bindClickHandler.js +++ b/src/staticMethods/bindClickHandler.js @@ -11,7 +11,6 @@ export function bindClickHandler (attr = 'data-swal-template') { } const bodyClickListener = (event) => { - // TODO: replace with event.composedPath() for (let el = event.target; el && el !== document; el = el.parentNode) { for (const attr in clickHandlers) { const template = el.getAttribute(attr) diff --git a/src/variables.scss b/src/variables.scss index e009f90b4..ee7be4680 100644 --- a/src/variables.scss +++ b/src/variables.scss @@ -234,11 +234,11 @@ $swal2-toast-close-button-margin: 0 !default; $swal2-toast-close-button-font-size: 2em !default; $swal2-toast-width: 360px !default; $swal2-toast-padding: 1em !default; -$swal2-toast-title-margin: 1em !default; +$swal2-toast-title-margin: .5em 1em !default; $swal2-toast-title-padding: 0 !default; $swal2-toast-title-font-size: 1em !default; $swal2-toast-icon-font-size: 1.8em !default; -$swal2-toast-html-container-margin: 1em !default; +$swal2-toast-html-container-margin: .5em 1em !default; $swal2-toast-html-container-padding: 0 !default; $swal2-toast-html-container-font-size: 1em !default; $swal2-toast-input-height: 2em !default;