1
0
mirror of https://github.com/dani/vroom.git synced 2024-06-28 01:39:29 +02:00

Better etherpad iframe sizing

This commit is contained in:
Daniel Berteaud 2014-06-13 13:29:29 +02:00
parent 5beda54955
commit 261ac0bdc3
2 changed files with 4 additions and 2 deletions

View File

@ -163,6 +163,7 @@
#etherpadContainer {
display: none;
height: auto;
overflow-y: scroll;
}
#chatBox {
max-height:300px;

View File

@ -1937,7 +1937,7 @@ function initVroom(room) {
padId: etherpad.group + '$' + room,
showControls: true,
showLineNumbers: true,
height: maxHeight() + 'px',
height: maxHeight()-7 + 'px',
border: 2,
userColor: peers.local.color
});
@ -1991,10 +1991,11 @@ function initVroom(room) {
window.onresize = function (){
$('#webRTCVideo').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
$('#webRTCVideo').css('max-height', maxHeight());
$('#etherpadContainer').css('max-height', maxHeight());
};