mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

restore footer fluidity

Browse source
This commit is contained in:
Luke Pulverenti 2014-03-17 21:45:28 -04:00
parent 3e0fc7ada1
commit fdda8549ba
4 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

7
dashboard-ui/css/site.css
View file

@ -686,14 +686,9 @@ h1 .imageLink {
height: 50px; height: 50px;
} }
.footerNotifications {
height: 50px;
margin: 0 2px 2px 2px;
}
.footerNotification { .footerNotification {
text-shadow: none; text-shadow: none;
padding: 0 1em .75em; padding: .75em 1em;
margin: 0; margin: 0;
font-weight: normal; font-weight: normal;
border-top: 1px solid #555; border-top: 1px solid #555;

4
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -56,7 +56,7 @@
$("#videoBackdrop", footer).hide(); $("#videoBackdrop", footer).hide();
if ($("#footerNotifications", footer).html() == "") { // only hide footer if no notifications if (!$("#footerNotifications", footer).html()) { // only hide footer if no notifications
footer.hide(); footer.hide();
@ -1036,7 +1036,7 @@
var errorMsg = 'There was an error playing the video.'; var errorMsg = 'There was an error playing the video.';
if (item.Type == "Channel") { if (item.Type == "TvChannel") {
errorMsg += " Please ensure there is an open tuner availalble."; errorMsg += " Please ensure there is an open tuner availalble.";
} }

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -704,7 +704,7 @@
}); });
} }
else if (item.Type == "Channel" || item.Type == "Recording") { else if (item.Type == "TvChannel" || item.Type == "Recording") {
url = "css/images/items/detail/tv.png"; url = "css/images/items/detail/tv.png";
} }
else if (item.MediaType == "Audio") { else if (item.MediaType == "Audio") {

6
dashboard-ui/scripts/site.js
View file

@ -318,22 +318,16 @@ var Dashboard = {
if (videoBackdrop.is(":visible")) { if (videoBackdrop.is(":visible")) {
footer.css("height", "50px");
videoBackdrop.css("bottom", "48px"); videoBackdrop.css("bottom", "48px");
isPlaying = true; isPlaying = true;
} else { } else {
if (!footer.is(":visible")) {
footer.show(); footer.show();
} }
}
elem.html(options.html).trigger("create"); elem.html(options.html).trigger("create");
if (options.timeout) { if (options.timeout) {