diff --git a/static/css/style.css b/static/css/style.css index 3b560a69..51ac1a01 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -337,7 +337,7 @@ ul #chat-log{ padding-right: 3%; } #playlist{ - padding:0px 15px; + /*padding:0px 15px;*/ } #player{ @@ -709,10 +709,20 @@ ul #chat-log{ .title-container li { width: 71%; } + + #wrapper { + height: 100%; + width: 113%; + overflow: auto; + padding-right: 7vh; + opacity: 1; + } + #playlist{ - padding:0px 15px; - overflow: hidden; + /*padding:0px 15px;*/ height: 90%; height: calc(100% - 64px); + overflow: hidden; + padding:0px 0px 0px 0px; } } diff --git a/static/js/list.js b/static/js/list.js index f06cf968..ef2c2f16 100755 --- a/static/js/list.js +++ b/static/js/list.js @@ -87,12 +87,12 @@ function populate_list(msg, conf_only) if(scroller === false) { - myScroll = new IScroll('#playlist', { + /*myScroll = new IScroll('#playlist', { mouseWheel: true, scrollY: true, }); scroller = true; - myScroll.maxScrollY = myScroll.maxScrollY - 5; + myScroll.maxScrollY = myScroll.maxScrollY - 5;*/ }else { refresh_scroll(); @@ -104,8 +104,8 @@ function populate_list(msg, conf_only) //document.getElementById("player").style.display="none"; //ytplayer.pauseVideo(); }else{ - myScroll.refresh(); - myScroll.maxScrollY = myScroll.maxScrollY - 5; + //myScroll.refresh(); + //myScroll.maxScrollY = myScroll.maxScrollY - 5; } $("#settings").css("visibility", "visible"); @@ -152,11 +152,11 @@ function importOldList(chan){ function refresh_scroll() { - if(myScroll !== undefined) + /*if(myScroll !== undefined) { myScroll.refresh(); myScroll.maxScrollY = myScroll.maxScrollY - 5; - } + }*/ } function show(){