MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch '2.4' of https://github.com/MISP/MISP into 2.4

pull/3660/merge
chrisr3d 2019-03-29 18:33:33 +01:00
parent 0b422b54d8 04fc76f11d
commit 556ef2e8f8
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/webroot/js/attack_matrix.js
View File

@ -181,15 +181,19 @@
minOverwrite = minOverwrite !== undefined ? minOverwrite : minWidth;
minOverwrite = minWidth > minOverwrite ? minWidth : minOverwrite;
if($(window).width()*0.5+700 <= minOverwrite) {
$('#popover_form_large').css('position', 'absolute');
$('#popover_form_large').css('left', '10px');
var topOff = $('#popover_form_large').offset().top;
savedTopOffset = topOff >= $(document).scrollTop() ? topOff - $(document).scrollTop() : topOff;
$('#popover_form_large').css('top', savedTopOffset+$(document).scrollTop()+'px');
$('#popover_form_large').css({
position: 'absolute',
left: '10px',
top: savedTopOffset+$(document).scrollTop()+'px'
});
} else {
$('#popover_form_large').css('position', 'fixed');
$('#popover_form_large').css('left', '');
$('#popover_form_large').css('top', savedTopOffset);
$('#popover_form_large').css({
position: 'absolute',
left: '',
top: savedTopOffset
});
}
}

2
app/webroot/js/misp.js
View File

@ -1433,7 +1433,7 @@ function openPopup(id) {
var window_height = $(window).height();
var popup_height = $(id).height();
if (window_height < popup_height) {
$(id).css("top", 0);
$(id).css("top", 50);
$(id).css("height", window_height);
$(id).addClass('vertical-scroll');
} else {