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

Merge pull request #308 from zoff-music/feature/prettier-PiP

Browse Source 
Feature/prettier pi p
This commit is contained in:
Kasper Rynning-Tønnesen
2018-02-15 12:32:35 +01:00
committed by GitHub
parent 5c1d0b4096 1c222b3812
commit 1faf89e474
3 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
server/public/assets/css/style.css
View File

@@ -425,13 +425,13 @@ li.disabled span {
#closePlayer{ #closePlayer{
position: fixed; position: fixed;
bottom: 175px; top: 7px;
right: 20px; right: 14px;
z-index: 999999999999999; z-index: 999999999999999;
font-size: 18px; font-size: 18px;
color: white; color: white;
text-shadow: 0px 0px 2px black; text-shadow: 0px 0px 2px black;
cursor:pointer; cursor: pointer;
} }
#player_bottom_overlay{ #player_bottom_overlay{
@@ -439,6 +439,11 @@ li.disabled span {
cursor: pointer; cursor: pointer;
top: 0px; top: 0px;
left: 0px; left: 0px;
-webkit-transition: all .5s ease-out;
-moz-transition: all .5s ease-out;
-ms-transition: all .5s ease-out;
-o-transition: all .5s ease-out;
transition: all .5s ease-out;
} }
.frontpage_modified_heights{ .frontpage_modified_heights{
@@ -458,7 +463,7 @@ li.disabled span {
display: block !important; display: block !important;
/* right: 10px; */ /* right: 10px; */
z-index: 10; z-index: 10;
transition: 1s; /*transition: 1s;*/
} }
#frontpage_player{ #frontpage_player{
@@ -886,6 +891,27 @@ hide mdi-action-visibility mdi-action-visibility-off
width: 100%; width: 100%;
} }
#player_bottom_overlay::after {
background: rgba(0,0,0,.8);
content: "To Channel";
width: 100%;
position: absolute;
left: 0px;
height: 100%;
top: 0px;
display: flex;
justify-content: center;
align-items: center;
color: white;
transition: opacity .5s;
opacity: 0;
}
#player_bottom_overlay:hover#player_bottom_overlay::after {
opacity: 1;
cursor: pointer;
}
/*#nav-mobile{ /*#nav-mobile{
margin:-1px; margin:-1px;
}*/ }*/
@@ -2535,6 +2561,10 @@ nav ul li:hover, nav ul li.active {
margin-bottom: 18px; margin-bottom: 18px;
} }
#player_bottom_overlay {
top: 7px;
}
.mobile-delete { .mobile-delete {
height: 100%; height: 100%;
position: absolute; position: absolute;

2
server/public/assets/js/channel.js
View File

@@ -556,7 +556,6 @@ var Channel = {
if(!Helper.mobilecheck() && !user_auth_avoid){ if(!Helper.mobilecheck() && !user_auth_avoid){
$(".video-container").resizable("destroy"); $(".video-container").resizable("destroy");
$("main").append("<a id='closePlayer' title='Close Player'>X</a>");
$("#playbar").remove(); $("#playbar").remove();
$(".ui-resizable-handle").remove(); $(".ui-resizable-handle").remove();
$("#main_components").remove(); $("#main_components").remove();
@@ -565,6 +564,7 @@ var Channel = {
$("#player").css("opacity", "1"); $("#player").css("opacity", "1");
$("#video-container").removeClass("no-opacity"); $("#video-container").removeClass("no-opacity");
$("#main-row").prepend("<div id='player_bottom_overlay' title='To Channel' class='player player_bottom'></div>"); $("#main-row").prepend("<div id='player_bottom_overlay' title='To Channel' class='player player_bottom'></div>");
$("#player_bottom_overlay").append("<a id='closePlayer' title='Close Player'>X</a>");
$("#playlist").remove(); $("#playlist").remove();
} else { } else {
try{ try{

3
server/public/assets/js/listeners.js
View File

@@ -1134,7 +1134,8 @@ $(document).on("click", ".brand-logo-navigate", function(e){
Channel.onepage_load(); Channel.onepage_load();
}); });
$(document).on("click", "#player_bottom_overlay", function(){ $(document).on("click", "#player_bottom_overlay", function(e){
if($(e.target).attr("id") == "closePlayer")) return;
Frontpage.to_channel(chan.toLowerCase(), false); Frontpage.to_channel(chan.toLowerCase(), false);
}); });