dani
/
vroom
mirror of https://github.com/dani/vroom.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Better etherpad iframe sizing

Browse Source
master
Daniel Berteaud 11 years ago
parent 5beda54955
commit 261ac0bdc3
2 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      public/css/vroom.css
  2. 5
      public/js/vroom.js

1
public/css/vroom.css
Unescape View File

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

5
public/js/vroom.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save