mirror of
https://github.com/dani/vroom.git
synced 2024-06-30 07:13:41 +02:00
Better etherpad iframe sizing
This commit is contained in:
parent
5beda54955
commit
261ac0bdc3
|
@ -163,6 +163,7 @@
|
||||||
#etherpadContainer {
|
#etherpadContainer {
|
||||||
display: none;
|
display: none;
|
||||||
height: auto;
|
height: auto;
|
||||||
|
overflow-y: scroll;
|
||||||
}
|
}
|
||||||
#chatBox {
|
#chatBox {
|
||||||
max-height:300px;
|
max-height:300px;
|
||||||
|
|
|
@ -1937,7 +1937,7 @@ function initVroom(room) {
|
||||||
padId: etherpad.group + '$' + room,
|
padId: etherpad.group + '$' + room,
|
||||||
showControls: true,
|
showControls: true,
|
||||||
showLineNumbers: true,
|
showLineNumbers: true,
|
||||||
height: maxHeight() + 'px',
|
height: maxHeight()-7 + 'px',
|
||||||
border: 2,
|
border: 2,
|
||||||
userColor: peers.local.color
|
userColor: peers.local.color
|
||||||
});
|
});
|
||||||
|
@ -1991,10 +1991,11 @@ function initVroom(room) {
|
||||||
window.onresize = function (){
|
window.onresize = function (){
|
||||||
$('#webRTCVideo').css('max-height', maxHeight());
|
$('#webRTCVideo').css('max-height', maxHeight());
|
||||||
$('#mainVideo>video').css('max-height', maxHeight());
|
$('#mainVideo>video').css('max-height', maxHeight());
|
||||||
$('#epframetherpadContainer').css('max-height', maxHeight());
|
$('#etherpadContainer').css('max-height', maxHeight());
|
||||||
};
|
};
|
||||||
// Preview heigh is limited to the windows heigh, minus the navbar, minus 25px
|
// Preview heigh is limited to the windows heigh, minus the navbar, minus 25px
|
||||||
$('#webRTCVideo').css('max-height', maxHeight());
|
$('#webRTCVideo').css('max-height', maxHeight());
|
||||||
|
$('#etherpadContainer').css('max-height', maxHeight());
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user