Merge branch 'master' into dev

This commit is contained in:
calzoneman 2013-08-04 11:46:33 -04:00
commit 0aa8e0f930
6 changed files with 11 additions and 9 deletions

View file

@ -356,7 +356,7 @@ $("#shuffleplaylist").click(function() {
/* layout stuff */
$(window).resize(function() {
VWIDTH = $("#queue").css("width").replace("px", "");
VWIDTH = $("#videowidth").css("width").replace("px", "");
VHEIGHT = ""+parseInt(parseInt(VWIDTH) * 9 / 16);
$("#messagebuffer").css("height", (VHEIGHT - 31) + "px");
$("#userlist").css("height", (VHEIGHT - 31) + "px");