Merge branch 'master' of github.com:ZoneMinder/zoneminder
commit
d1c140e0a1
|
@ -1123,6 +1123,20 @@ html::-webkit-scrollbar-thumb, div::-webkit-scrollbar-thumb, nav::-webkit-scroll
|
|||
}
|
||||
}
|
||||
|
||||
@media screen and (max-height:600px) {
|
||||
.sticky #mfbpanel {
|
||||
max-height: 40vh;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
.sticky #toolbar {
|
||||
max-height: 20vh;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
}
|
||||
}
|
||||
|
||||
/* +++ Control button block in the Stream image*/
|
||||
.block-button-center {
|
||||
position: absolute;
|
||||
|
|
|
@ -231,8 +231,8 @@ function renderAlarmCues(containerEl) {
|
|||
//console.log(left, frame.Delta, event_length, containerEl.width());
|
||||
spanTimeStart = spanTimeEnd;
|
||||
} else if ( (frame.Type !== 'Alarm') && (alarmed == 1) ) { //from alarm to nothing. End alarm and start nothing.
|
||||
futNone = 0;
|
||||
indexPlus = i+1;
|
||||
let futNone = 0;
|
||||
let indexPlus = i+1;
|
||||
if (((frame.Delta * 100) - spanTimeStart) < minAlarm && indexPlus < num_cueFrames) {
|
||||
//alarm is too short and there is more event
|
||||
continue;
|
||||
|
|
Loading…
Reference in New Issue