From 0236624bd601a54e25c98f151746d4d7420c33f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= Date: Fri, 19 Jun 2015 19:23:56 +0200 Subject: [PATCH] Found more errors left from the doctype html and cleaned it up --- php/footer.php | 1 - static/css/style.css | 18 +++++++++++++++++- static/js/admin.js | 1 - static/js/chat.js | 1 - static/js/list.js | 2 +- static/js/youtube.js | 2 +- 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/php/footer.php b/php/footer.php index e97e86c1..63e9dd24 100755 --- a/php/footer.php +++ b/php/footer.php @@ -70,7 +70,6 @@ var socket = io.connect('//'+window.location.hostname+':3000'); var guid = ""; socket.on("get_list", function(){ - console.log("get_list"); socket.emit('list', ','+guid); }); diff --git a/static/css/style.css b/static/css/style.css index 2851214d..1ffd0808 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -555,7 +555,9 @@ ul #chat-log{ } .switch{ display: inline; - float: right; + /*float: right;*/ + position: absolute; + right:10px; } .switch label .lever { background-color: #00B2FF; @@ -723,6 +725,15 @@ ul #chat-log{ position: absolute !important; width: 120px; } + + .page-footer{ + margin-top:40px !important; + } + + .main, #main-row, .video-container, #playlist{ + height:100% !important; + } + .control-list li a{ min-width: 0px; width: 37px; padding: 0 0 0 5px;} nav .zbrand{ @@ -734,6 +745,11 @@ ul #chat-log{ width: calc(100% - 100px); } + #search_loader{ + margin-left: -75px; + margin-top: 5px; + } + .title-container{ background-color: rgba(0,0,0,0.1); display: inline-block; diff --git a/static/js/admin.js b/static/js/admin.js index abf626fd..30a7cb59 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -113,7 +113,6 @@ function save(){ function submitAdmin(form) { - console.log(form); voting = form.vote.checked; addsongs = form.addsongs.checked; longsongs = form.longsongs.checked; diff --git a/static/js/chat.js b/static/js/chat.js index add48bdc..8346c3a4 100755 --- a/static/js/chat.js +++ b/static/js/chat.js @@ -17,7 +17,6 @@ function chat(data) setup_chat_listener(chan); document.getElementById("chat-btn").addEventListener("click", function(){ - console.log("clicked"); $("#text-chat-input").focus(); //$("#chat-btn").css("color", "white"); $("#chat-btn i").css("opacity", 1); diff --git a/static/js/list.js b/static/js/list.js index 4fdfae7c..1fd17bec 100755 --- a/static/js/list.js +++ b/static/js/list.js @@ -21,7 +21,7 @@ socket.on(chan.toLowerCase(), function(msg){ function channel_function(msg) { - console.log(msg); + //console.log(msg); if(msg[0] == "list") { full_playlist = msg[1]; diff --git a/static/js/youtube.js b/static/js/youtube.js index c685a2b3..efd57564 100755 --- a/static/js/youtube.js +++ b/static/js/youtube.js @@ -27,7 +27,7 @@ function setup_youtube_listener(channel) { socket.on("np", function(obj) { - console.log(obj); + //console.log(obj); if(obj[0].length == 0){ console.log("Empty list"); document.getElementById('song-title').innerHTML = "Empty channel. Add some songs!";