TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old fix and spruce up code

This commit is contained in:
Samuel Georges 2017-03-04 15:23:12 +11:00
parent 380a71d7b9
commit d642605f87
4 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/assets/js/backend.js
View File

@ -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()
))
}
}

3
modules/backend/assets/js/october-min.js vendored
View File

@ -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))}}
function fixSidebar(){$('#layout-sidenav').height(Math.max($('#layout-body').innerHeight(),$(window).height()-$('#layout-mainmenu').height()))}}

2
modules/cms/widgets/mediamanager/assets/css/mediamanager.css
View File

@ -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}

5
modules/cms/widgets/mediamanager/assets/less/mediamanager.less
View File

@ -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 {