mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #773 from dkanada/style
Minor theme changes and tweak session cards on dashboard
This commit is contained in:
commit
ec2cad0c8d
10 changed files with 43 additions and 33 deletions
|
@ -224,6 +224,12 @@
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.centerMessage {
|
||||||
|
margin: auto;
|
||||||
|
width: 30%;
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
.layout-desktop .searchTabButton,
|
.layout-desktop .searchTabButton,
|
||||||
.layout-mobile .searchTabButton,
|
.layout-mobile .searchTabButton,
|
||||||
.layout-tv .headerSearchButton {
|
.layout-tv .headerSearchButton {
|
||||||
|
|
|
@ -2,24 +2,18 @@ define(['browser', 'css!./appfooter'], function (browser) {
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
function render(options) {
|
function render(options) {
|
||||||
|
|
||||||
var elem = document.createElement('div');
|
var elem = document.createElement('div');
|
||||||
|
|
||||||
elem.classList.add('appfooter');
|
elem.classList.add('appfooter');
|
||||||
|
|
||||||
elem.classList.add('appfooter-blurred');
|
|
||||||
|
|
||||||
document.body.appendChild(elem);
|
document.body.appendChild(elem);
|
||||||
|
|
||||||
return elem;
|
return elem;
|
||||||
}
|
}
|
||||||
|
|
||||||
function appFooter(options) {
|
function appFooter(options) {
|
||||||
|
|
||||||
var self = this;
|
var self = this;
|
||||||
|
|
||||||
self.element = render(options);
|
self.element = render(options);
|
||||||
|
|
||||||
self.add = function (elem) {
|
self.add = function (elem) {
|
||||||
self.element.appendChild(elem);
|
self.element.appendChild(elem);
|
||||||
};
|
};
|
||||||
|
|
|
@ -104,24 +104,17 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
|
||||||
}
|
}
|
||||||
|
|
||||||
function showSortMenu() {
|
function showSortMenu() {
|
||||||
|
|
||||||
var instance = this;
|
var instance = this;
|
||||||
|
|
||||||
require(['sortMenu'], function (SortMenu) {
|
require(['sortMenu'], function (SortMenu) {
|
||||||
|
|
||||||
new SortMenu().show({
|
new SortMenu().show({
|
||||||
|
|
||||||
settingsKey: instance.getSettingsKey(),
|
settingsKey: instance.getSettingsKey(),
|
||||||
settings: instance.getSortValues(),
|
settings: instance.getSortValues(),
|
||||||
onChange: instance.itemsContainer.refreshItems.bind(instance.itemsContainer),
|
onChange: instance.itemsContainer.refreshItems.bind(instance.itemsContainer),
|
||||||
serverId: instance.params.serverId,
|
serverId: instance.params.serverId,
|
||||||
sortOptions: instance.getSortMenuOptions()
|
sortOptions: instance.getSortMenuOptions()
|
||||||
|
|
||||||
}).then(function () {
|
}).then(function () {
|
||||||
|
|
||||||
updateSortText(instance);
|
updateSortText(instance);
|
||||||
updateAlphaPickerState(instance);
|
updateAlphaPickerState(instance);
|
||||||
|
|
||||||
instance.itemsContainer.refreshItems();
|
instance.itemsContainer.refreshItems();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
@ -301,23 +301,30 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
html += '<div class="sessionCardFooter cardFooter">';
|
html += '<div class="sessionCardFooter cardFooter">';
|
||||||
html += '<div class="sessionCardButtons flex align-items-center justify-content-center">';
|
html += '<div class="sessionCardButtons flex align-items-center justify-content-center">';
|
||||||
var btnCssClass;
|
|
||||||
btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== connectionManager.deviceId() ? "" : " hide";
|
var btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? "" : " hide";
|
||||||
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><i class="material-icons">pause</i></button>';
|
var playIcon = session.PlayState.IsPaused ? 'pause' : 'play';
|
||||||
|
|
||||||
|
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><i class="material-icons">' + playIcon + '</i></button>';
|
||||||
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionStop paper-icon-button-light ' + btnCssClass + '"><i class="material-icons">stop</i></button>';
|
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionStop paper-icon-button-light ' + btnCssClass + '"><i class="material-icons">stop</i></button>';
|
||||||
|
|
||||||
btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? "" : " hide";
|
btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? "" : " hide";
|
||||||
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("ViewPlaybackInfo") + '"><i class="material-icons">info</i></button>';
|
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("ViewPlaybackInfo") + '"><i class="material-icons">info</i></button>';
|
||||||
|
|
||||||
btnCssClass = session.ServerId && -1 !== session.SupportedCommands.indexOf("DisplayMessage") && session.DeviceId !== connectionManager.deviceId() ? "" : " hide";
|
btnCssClass = session.ServerId && -1 !== session.SupportedCommands.indexOf("DisplayMessage") && session.DeviceId !== connectionManager.deviceId() ? "" : " hide";
|
||||||
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("SendMessage") + '"><i class="material-icons">message</i></button>';
|
html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("SendMessage") + '"><i class="material-icons">message</i></button>';
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
|
|
||||||
html += '<div class="sessionNowPlayingStreamInfo" style="padding:.5em 0 1em;">';
|
html += '<div class="sessionNowPlayingStreamInfo" style="padding:.5em 0 1em;">';
|
||||||
html += DashboardPage.getSessionNowPlayingStreamInfo(session);
|
html += DashboardPage.getSessionNowPlayingStreamInfo(session);
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
|
|
||||||
html += '<div class="flex align-items-center justify-content-center">';
|
html += '<div class="flex align-items-center justify-content-center">';
|
||||||
var userImage = DashboardPage.getUserImage(session);
|
var userImage = DashboardPage.getUserImage(session);
|
||||||
html += userImage ? '<div class="activitylogUserPhoto" style="background-image:url(\'' + userImage + "');\"></div>" : '<div style="height:1.71em;"></div>';
|
html += userImage ? '<div class="activitylogUserPhoto" style="background-image:url(\'' + userImage + "');\"></div>" : '<div style="height:1.71em;"></div>';
|
||||||
html += '<div class="sessionUserName">';
|
html += '<div class="sessionUserName">';
|
||||||
html += DashboardPage.getUsersHtml(session);
|
html += DashboardPage.getUsersHtml(session);
|
||||||
|
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
html += "</div>";
|
html += "</div>";
|
||||||
|
|
|
@ -47,10 +47,6 @@
|
||||||
background: transparent;
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-flat:hover {
|
|
||||||
opacity: 0.5;
|
|
||||||
}
|
|
||||||
|
|
||||||
.button-link {
|
.button-link {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
|
|
@ -182,7 +182,7 @@ html {
|
||||||
}
|
}
|
||||||
|
|
||||||
@supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) {
|
@supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) {
|
||||||
.appfooter-blurred {
|
.appfooter {
|
||||||
background: rgba(1, 2, 50, 0.7);
|
background: rgba(1, 2, 50, 0.7);
|
||||||
backdrop-filter: blur(20px);
|
backdrop-filter: blur(20px);
|
||||||
}
|
}
|
||||||
|
@ -241,7 +241,10 @@ html {
|
||||||
border-color: #00a4dc;
|
border-color: #00a4dc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-flat-accent,
|
.button-flat:hover {
|
||||||
|
color: #00a4dc;
|
||||||
|
}
|
||||||
|
|
||||||
.button-link {
|
.button-link {
|
||||||
color: #00a4dc;
|
color: #00a4dc;
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,7 @@ html {
|
||||||
}
|
}
|
||||||
|
|
||||||
.skinHeader-withBackground {
|
.skinHeader-withBackground {
|
||||||
background-color: #101010;
|
background-color: #202020;
|
||||||
}
|
}
|
||||||
|
|
||||||
.skinHeader.semiTransparent {
|
.skinHeader.semiTransparent {
|
||||||
|
@ -157,7 +157,7 @@ html {
|
||||||
}
|
}
|
||||||
|
|
||||||
.appfooter {
|
.appfooter {
|
||||||
background: #101010;
|
background: #202020;
|
||||||
color: #ccc;
|
color: #ccc;
|
||||||
color: rgba(255, 255, 255, 0.78);
|
color: rgba(255, 255, 255, 0.78);
|
||||||
}
|
}
|
||||||
|
@ -195,6 +195,10 @@ html {
|
||||||
background: rgba(30, 30, 30, 0.9);
|
background: rgba(30, 30, 30, 0.9);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.detailSticky {
|
||||||
|
background: #202020;
|
||||||
|
}
|
||||||
|
|
||||||
.listItem-border {
|
.listItem-border {
|
||||||
border-color: rgba(34, 34, 34, 0.9) !important;
|
border-color: rgba(34, 34, 34, 0.9) !important;
|
||||||
}
|
}
|
||||||
|
@ -207,7 +211,10 @@ html {
|
||||||
border-color: #00a4dc;
|
border-color: #00a4dc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-flat-accent,
|
.button-flat:hover {
|
||||||
|
color: #00a4dc;
|
||||||
|
}
|
||||||
|
|
||||||
.button-link {
|
.button-link {
|
||||||
color: #00a4dc;
|
color: #00a4dc;
|
||||||
}
|
}
|
||||||
|
|
|
@ -276,7 +276,7 @@ a[data-role=button] {
|
||||||
}
|
}
|
||||||
|
|
||||||
@supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) {
|
@supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) {
|
||||||
.appfooter-blurred {
|
.appfooter {
|
||||||
background: rgba(6, 37, 111, 0.7);
|
background: rgba(6, 37, 111, 0.7);
|
||||||
backdrop-filter: blur(20px);
|
backdrop-filter: blur(20px);
|
||||||
}
|
}
|
||||||
|
@ -328,7 +328,10 @@ a[data-role=button] {
|
||||||
border-color: #48c3c8;
|
border-color: #48c3c8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-flat-accent,
|
.button-flat:hover {
|
||||||
|
color: #48c3c8;
|
||||||
|
}
|
||||||
|
|
||||||
.button-link {
|
.button-link {
|
||||||
color: #48c3c8;
|
color: #48c3c8;
|
||||||
}
|
}
|
||||||
|
|
|
@ -223,7 +223,10 @@ html {
|
||||||
border-color: #00a4dc;
|
border-color: #00a4dc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.button-flat-accent,
|
.button-flat:hover {
|
||||||
|
color: #00a4dc;
|
||||||
|
}
|
||||||
|
|
||||||
.button-link {
|
.button-link {
|
||||||
color: #00a4dc;
|
color: #00a4dc;
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,11 +45,9 @@
|
||||||
<div class="pageTabContent" id="upcomingTab" data-index="3">
|
<div class="pageTabContent" id="upcomingTab" data-index="3">
|
||||||
<div id="upcomingItems">
|
<div id="upcomingItems">
|
||||||
</div>
|
</div>
|
||||||
<div class="noItemsMessage" style="display: none;">
|
<div class="noItemsMessage centerMessage" style="display: none;">
|
||||||
<p>${MessageNothingHere}</p>
|
<h1>${MessageNothingHere}</h1>
|
||||||
<p>
|
<p>${MessagePleaseEnsureInternetMetadata}</p>
|
||||||
<a href="library.html">${MessagePleaseEnsureInternetMetadata}</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="pageTabContent" id="genresTab" data-index="4">
|
<div class="pageTabContent" id="genresTab" data-index="4">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue