From e35ce81e2777b37712982c4297866ef35ffb9a3c Mon Sep 17 00:00:00 2001 From: Jack Date: Sun, 9 Sep 2018 20:36:59 -0700 Subject: [PATCH] Fix legacy modals to support top aligned, fix bug in ie11 for swapping between top/middle aligned --- src/definitions/modules/modal.js | 9 ++++++--- src/definitions/modules/modal.less | 23 ++++++++++++++++++++++- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/definitions/modules/modal.js b/src/definitions/modules/modal.js index f281a3b08..40bb02f83 100755 --- a/src/definitions/modules/modal.js +++ b/src/definitions/modules/modal.js @@ -110,8 +110,7 @@ $.fn.modal = function(parameters) { debug : settings.debug, variation : settings.centered ? false - : 'top aligned' - , + : 'top aligned', dimmerName : 'modals' }, dimmerSettings = $.extend(true, defaultSettings, settings.dimmerSettings) @@ -305,6 +304,7 @@ $.fn.modal = function(parameters) { ? callback : function(){} ; + console.log('test'); module.refreshModals(); module.set.dimmerSettings(); module.showModal(callback); @@ -690,9 +690,12 @@ $.fn.modal = function(parameters) { width = module.cache.width, height = module.cache.height ; + console.log(module.can.fit()); $module .css({ - marginTop: -(height / 2), + marginTop: (settings.centered && module.can.fit()) + ? -(height / 2) + : 0, marginLeft: -(width / 2) }) ; diff --git a/src/definitions/modules/modal.less b/src/definitions/modules/modal.less index 03e12b954..479786a1d 100755 --- a/src/definitions/modules/modal.less +++ b/src/definitions/modules/modal.less @@ -317,6 +317,13 @@ left: 50%; } +.ui.legacy.page.dimmer > .ui.scrolling.modal, +.ui.page.dimmer > .ui.scrolling.legacy.modal, +.ui.top.aligned.legacy.page.dimmer > .ui.modal, +.ui.top.aligned.dimmer > .ui.legacy.modal { + top: auto; +} + /* Tablet and Mobile */ @media only screen and (max-width : @largestTabletScreen) { .ui.basic.modal > .close { @@ -351,6 +358,20 @@ .modals.dimmer[class*="top aligned"] .modal { margin: @topAlignedMargin auto; } +@media only screen and (max-width : @largestMobileScreen) { + .modals.dimmer[class*="top aligned"] .modal { + margin: @mobileTopAlignedMargin auto; + } +} +/* Legacy Top Aligned */ +.legacy.modals.dimmer[class*="top aligned"] { + padding-top: @topAlignedMargin; +} +@media only screen and (max-width : @largestMobileScreen) { + .legacy.modals.dimmer[class*="top aligned"] { + padding-top: @mobileTopAlignedMargin; + } +} /*-------------- Scrolling @@ -371,7 +392,7 @@ position: fixed; } .modals.dimmer .ui.scrolling.modal { - margin: @scrollingMargin auto !important; + margin: @scrollingMargin auto; } /* Undetached Scrolling */