KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed a lot of dead elements when navigating back and forth, and added transition on videoplayer

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-04-29 11:35:19 +02:00
parent 2b531039c0
commit d503d3a41b
5 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/css/style.css
View File

@@ -336,13 +336,14 @@
.player_bottom{ .player_bottom{
position: fixed !important; position: fixed !important;
left: auto !important; left: calc(100vw - 270px) !important;
top: auto !important; top: calc(100vh - 210px) !important;
bottom: 10px; /* bottom: 10px; */
width: 250px !important; width: 250px !important;
height: 200px !important; height: 200px !important;
right: 10px; /* right: 10px; */
z-index: 10; z-index: 10;
transition: 1s;
} }
#frontpage_player{ #frontpage_player{
@@ -1457,6 +1458,7 @@ ul #chat-log{
height:95%; height:95%;
height: calc(100% - 32px); height: calc(100% - 32px);
position: relative; position: relative;
-webkit-transition: all 1s ease-out;
} }
#fireplace_player{ #fireplace_player{

4
public/dist/embed.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
public/dist/main.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/frontpage.js
View File

@@ -293,6 +293,7 @@ var Frontpage = {
socket.removeAllListeners(); socket.removeAllListeners();
} }
$("body").css("background-color", "#2d2d2d"); $("body").css("background-color", "#2d2d2d");
$("#offline-mode").tooltip("remove");
$.ajax({ $.ajax({
url: new_channel + "/public/php/index.php", url: new_channel + "/public/php/index.php",
@@ -417,7 +418,6 @@ function initfp(){
tooltip: "Enable private mode" tooltip: "Enable private mode"
}); });
} }
socket.emit('frontpage_lists'); socket.emit('frontpage_lists');
$("#channel-load").css("display", "none"); $("#channel-load").css("display", "none");

9
public/js/listeners.js
View File

@@ -1573,8 +1573,15 @@ function onepage_load(){
Admin.beginning = true; Admin.beginning = true;
began = false; began = false;
durationBegun = false; durationBegun = false;
$("#embed-button").css("display", "none");
$("#embed-button").css("display", "none");
$('.castButton-active').tooltip("remove");
$("#viewers").tooltip("remove");
$('.castButton-unactive').tooltip("remove");
$("#offline-mode").tooltip("remove");
$('#chan_thumbnail').tooltip("remove");
$('#admin-lock').tooltip("remove");
$("#seekToDuration").remove();
$.ajax({ $.ajax({
url: "public/php/frontpage.php", url: "public/php/frontpage.php",
success: function(e){ success: function(e){