diff --git a/server/public/assets/css/style.css b/server/public/assets/css/style.css index b1338081..18043e47 100755 --- a/server/public/assets/css/style.css +++ b/server/public/assets/css/style.css @@ -1632,7 +1632,7 @@ ul #chat-log{ .search_results { - background: black; + background: rgba(0,0,0,0.8); position: absolute; width: 100vw; top: 64px; @@ -3388,7 +3388,7 @@ nav ul li:hover, nav ul li.active { } #inner-results { - height: calc(100vh - 54px - 64px - 76px); + height: calc(100vh - 54px - 64px - 123px); overflow-y: scroll; overflow-x: hidden; } @@ -3413,10 +3413,32 @@ nav ul li:hover, nav ul li.active { margin-top: -16px; } - #results{ - background-color: #000; - margin-top:47px; + .search_results { + margin-top: 45px; + background: #000; } + + .results-tabs .indicator { + margin-top: 50px; + } + + #results, #results_soundcloud{ + background-color: #000; + margin-top:-8px; + } + + #results { + max-height: calc(100vh - 165px); + } + + #results_soundcloud { + height: calc(100vh - 64px - 54px); + } + + #results_soundcloud #inner-results { + height: calc(100vh - 54px - 64px - 47px); + } + .result{ margin: 0; width: 99%; diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js index a30e3faa..6b192240 100755 --- a/server/public/assets/js/player.js +++ b/server/public/assets/js/player.js @@ -318,7 +318,9 @@ var Player = { } }); } else { - player.seek(seekTo * 1000); + try { + Player.soundcloud_player.seek(seekTo * 1000); + } catch(e) {} } soundcloud_loading = true; if(start == undefined) start = 0; @@ -663,8 +665,8 @@ var Player = { player_ready = true; if(!window.MSStream) { if(Helper.mobilecheck()){ - Helper.css("#playpause", "visibility", "hidden"); - Helper.css("#playpause", "pointer-events", "none"); + /*Helper.css("#playpause", "visibility", "hidden"); + Helper.css("#playpause", "pointer-events", "none");*/ Helper.css("#player", "opacity", "1"); if(offline) { setTimeout(function(){ diff --git a/server/public/assets/js/suggestions.js b/server/public/assets/js/suggestions.js index f7a619bf..11706a8e 100755 --- a/server/public/assets/js/suggestions.js +++ b/server/public/assets/js/suggestions.js @@ -48,6 +48,7 @@ var Suggestions = { if(videoSource == "soundcloud") { Helper.addClass(document.querySelector(".suggest-title-info"), "hide"); Helper.addClass("#suggest-song-html", "hide"); + return; } else { Helper.removeClass(document.querySelector(".suggest-title-info"), "hide"); Helper.removeClass("#suggest-song-html", "hide");