diff --git a/modules/backend/assets/js/backend.js b/modules/backend/assets/js/backend.js index 3e64787ff..d21803df7 100644 --- a/modules/backend/assets/js/backend.js +++ b/modules/backend/assets/js/backend.js @@ -230,9 +230,9 @@ if (!!window.MSInputMethodContext && !!document.documentMode) { } function fixSidebar() { - var $el = $('#layout-sidenav'), - menuHeight = $('#layout-mainmenu').height() - - $el.height(Math.max($('#layout-body').innerHeight(), $(window).height() - menuHeight)) + $('#layout-sidenav').height(Math.max( + $('#layout-body').innerHeight(), + $(window).height() - $('#layout-mainmenu').height() + )) } } diff --git a/modules/backend/assets/js/october-min.js b/modules/backend/assets/js/october-min.js index 7ae404141..071d5884c 100644 --- a/modules/backend/assets/js/october-min.js +++ b/modules/backend/assets/js/october-min.js @@ -1347,5 +1347,4 @@ if(!!window.MSInputMethodContext&&!!document.documentMode){$(window).on('resize' fixSidebar()}) function fixMediaManager(){var $el=$('div[data-control="media-manager"] .control-scrollpad') $el.height($el.parent().height())} -function fixSidebar(){var $el=$('#layout-sidenav'),menuHeight=$('#layout-mainmenu').height() -$el.height(Math.max($('#layout-body').innerHeight(),$(window).height()-menuHeight))}} \ No newline at end of file +function fixSidebar(){$('#layout-sidenav').height(Math.max($('#layout-body').innerHeight(),$(window).height()-$('#layout-mainmenu').height()))}} \ No newline at end of file diff --git a/modules/cms/widgets/mediamanager/assets/css/mediamanager.css b/modules/cms/widgets/mediamanager/assets/css/mediamanager.css index 8d4a56ed7..d32171b99 100644 --- a/modules/cms/widgets/mediamanager/assets/css/mediamanager.css +++ b/modules/cms/widgets/mediamanager/assets/css/mediamanager.css @@ -64,7 +64,7 @@ div[data-control="media-manager"] .list-container p.no-data{padding:0 20px 20px div[data-control="media-manager"] .list-container li.no-data{padding-top:20px;display:block !important;width:100% !important;border:none !important;background:transparent !important;cursor:default !important} div[data-control="media-manager"] .list-container table.table.data tbody tr:not(.no-data):active td{background:#4ea5e0 !important} div[data-control="media-manager"] [data-control="item-list"]{position:relative;display:table-cell} -div[data-control="media-manager"] .control-scrollpad{position:absolute;left:0;top:0;min-height:300px} +div[data-control="media-manager"] .control-scrollpad{position:absolute;left:0;top:0} div[data-control="media-manager"] .scroll-wrapper{position:relative} div[data-control="media-manager"] table.table{table-layout:fixed;margin-bottom:0;white-space:nowrap} div[data-control="media-manager"] table.table div.no-wrap-text{overflow:hidden;text-overflow:ellipsis} diff --git a/modules/cms/widgets/mediamanager/assets/less/mediamanager.less b/modules/cms/widgets/mediamanager/assets/less/mediamanager.less index 1652cd5c7..e8106507b 100644 --- a/modules/cms/widgets/mediamanager/assets/less/mediamanager.less +++ b/modules/cms/widgets/mediamanager/assets/less/mediamanager.less @@ -379,11 +379,6 @@ div[data-control="media-manager"] { position: absolute; left: 0; top: 0; - - // This is a fix for IE11 that is buggy and ignores 100% - // height on containers, so this will at least cause the - // media manager to fail gracefully instead of breaking. - min-height: 300px; } .scroll-wrapper {