Merge pull request #362 from thusithak/master

EMM 2.2.0-Alpha2 theme migration and issue fixes
This commit is contained in:
Kamidu Sachith Punchihewa 2016-10-14 14:20:54 +05:30 committed by GitHub
commit c8073a0fd8
2 changed files with 4 additions and 3 deletions

View File

@ -91,9 +91,10 @@ function showPopup() {
* hide popup function. * hide popup function.
*/ */
function hidePopup() { function hidePopup() {
$(modalPopupContent).html(''); $(modalPopupContent).html("");
$(modalPopupContent).removeClass("operation-data");
$(modalPopup).modal('hide'); $(modalPopup).modal('hide');
$('body').removeClass('modal-open').css('padding-right', '0px'); $('body').removeClass('modal-open').css('padding-right','0px');
$('.modal-backdrop').remove(); $('.modal-backdrop').remove();
} }

View File

@ -70,7 +70,7 @@ var InitiateViewOption = null;
if(arrowPosition >= parentHeight){ if(arrowPosition >= parentHeight){
parentHeight = arrowPosition + 50; parentHeight = arrowPosition + 50;
$(arrow).siblings(".panel.active").height(parentHeight); $(arrow).siblings(".panel.active").css("min-height",parentHeight);
}else{ }else{
$(arrow).parent().removeAttr("style"); $(arrow).parent().removeAttr("style");
} }