From 532d73a80b8fe541d865d41ab6667ef4780f61f1 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 6 Feb 2020 00:13:11 +0900 Subject: [PATCH 1/2] minor theme changes --- src/components/appfooter/appfooter.js | 6 ------ src/controllers/dashboard/dashboard.js | 13 ++++++++++--- src/elements/emby-button/emby-button.css | 4 ---- src/themes/blueradiance/theme.css | 7 +++++-- src/themes/dark/theme.css | 13 ++++++++++--- src/themes/purplehaze/theme.css | 7 +++++-- src/themes/wmc/theme.css | 5 ++++- 7 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/components/appfooter/appfooter.js b/src/components/appfooter/appfooter.js index 61bb62ec29..07d7701ff2 100644 --- a/src/components/appfooter/appfooter.js +++ b/src/components/appfooter/appfooter.js @@ -2,24 +2,18 @@ define(['browser', 'css!./appfooter'], function (browser) { 'use strict'; function render(options) { - var elem = document.createElement('div'); - elem.classList.add('appfooter'); - elem.classList.add('appfooter-blurred'); - document.body.appendChild(elem); return elem; } function appFooter(options) { - var self = this; self.element = render(options); - self.add = function (elem) { self.element.appendChild(elem); }; diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js index 36cf80fb14..9746b58afe 100644 --- a/src/controllers/dashboard/dashboard.js +++ b/src/controllers/dashboard/dashboard.js @@ -301,23 +301,30 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa html += ""; html += '
'; html += '
'; - var btnCssClass; - btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== connectionManager.deviceId() ? "" : " hide"; - html += ''; + + var btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? "" : " hide"; + var playIcon = session.PlayState.IsPaused ? 'pause' : 'play'; + + html += ''; html += ''; + btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? "" : " hide"; html += ''; + btnCssClass = session.ServerId && -1 !== session.SupportedCommands.indexOf("DisplayMessage") && session.DeviceId !== connectionManager.deviceId() ? "" : " hide"; html += ''; html += "
"; + html += '
'; html += DashboardPage.getSessionNowPlayingStreamInfo(session); html += "
"; + html += '
'; var userImage = DashboardPage.getUserImage(session); html += userImage ? '
" : '
'; html += '
'; html += DashboardPage.getUsersHtml(session); + html += "
"; html += "
"; html += "
"; diff --git a/src/elements/emby-button/emby-button.css b/src/elements/emby-button/emby-button.css index 2776dec65d..a19ce571e2 100644 --- a/src/elements/emby-button/emby-button.css +++ b/src/elements/emby-button/emby-button.css @@ -47,10 +47,6 @@ background: transparent; } -.button-flat:hover { - opacity: 0.5; -} - .button-link { background: transparent; margin: 0; diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css index b1979e4901..f1faea2ffc 100644 --- a/src/themes/blueradiance/theme.css +++ b/src/themes/blueradiance/theme.css @@ -182,7 +182,7 @@ html { } @supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) { - .appfooter-blurred { + .appfooter { background: rgba(1, 2, 50, 0.7); backdrop-filter: blur(20px); } @@ -233,7 +233,10 @@ html { border-color: #00a4dc; } -.button-flat-accent, +.button-flat:hover { + color: #00a4dc; +} + .button-link { color: #00a4dc; } diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css index 58e9ab1856..2df689a84c 100644 --- a/src/themes/dark/theme.css +++ b/src/themes/dark/theme.css @@ -16,7 +16,7 @@ html { } .skinHeader-withBackground { - background-color: #101010; + background-color: #202020; } .skinHeader.semiTransparent { @@ -157,7 +157,7 @@ html { } .appfooter { - background: #101010; + background: #202020; color: #ccc; color: rgba(255, 255, 255, 0.78); } @@ -195,6 +195,10 @@ html { background: rgba(30, 30, 30, 0.9); } +.detailSticky { + background: #202020; +} + .listItem-border { border-color: rgba(34, 34, 34, 0.9) !important; } @@ -207,7 +211,10 @@ html { border-color: #00a4dc; } -.button-flat-accent, +.button-flat:hover { + color: #00a4dc; +} + .button-link { color: #00a4dc; } diff --git a/src/themes/purplehaze/theme.css b/src/themes/purplehaze/theme.css index 7f10c9265b..ab21a30321 100644 --- a/src/themes/purplehaze/theme.css +++ b/src/themes/purplehaze/theme.css @@ -276,7 +276,7 @@ a[data-role=button] { } @supports (backdrop-filter:blur(10px)) or (-webkit-backdrop-filter:blur(10px)) { - .appfooter-blurred { + .appfooter { background: rgba(6, 37, 111, 0.7); backdrop-filter: blur(20px); } @@ -321,7 +321,10 @@ a[data-role=button] { border-color: #48c3c8; } -.button-flat-accent, +.button-flat:hover { + color: #48c3c8; +} + .button-link { color: #48c3c8; } diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css index 4243204172..8235cf283b 100644 --- a/src/themes/wmc/theme.css +++ b/src/themes/wmc/theme.css @@ -219,7 +219,10 @@ html { border-color: #00a4dc; } -.button-flat-accent, +.button-flat:hover { + color: #00a4dc; +} + .button-link { color: #00a4dc; } From 1b23895e81f135ae4b4e914cabfe07405d19ba91 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 6 Feb 2020 03:14:17 +0900 Subject: [PATCH 2/2] fix placeholder message style --- src/assets/css/librarybrowser.css | 6 ++++++ src/components/tabbedview/itemstab.js | 7 ------- src/tv.html | 8 +++----- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index 8475b72b2f..9c6e532583 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -220,6 +220,12 @@ left: 0; } +.centerMessage { + margin: auto; + width: 30%; + text-align: center; +} + .layout-desktop .searchTabButton, .layout-mobile .searchTabButton, .layout-tv .headerSearchButton { diff --git a/src/components/tabbedview/itemstab.js b/src/components/tabbedview/itemstab.js index 33eddb6ec5..d430102f2a 100644 --- a/src/components/tabbedview/itemstab.js +++ b/src/components/tabbedview/itemstab.js @@ -104,24 +104,17 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts } function showSortMenu() { - var instance = this; - require(['sortMenu'], function (SortMenu) { - new SortMenu().show({ - settingsKey: instance.getSettingsKey(), settings: instance.getSortValues(), onChange: instance.itemsContainer.refreshItems.bind(instance.itemsContainer), serverId: instance.params.serverId, sortOptions: instance.getSortMenuOptions() - }).then(function () { - updateSortText(instance); updateAlphaPickerState(instance); - instance.itemsContainer.refreshItems(); }); }); diff --git a/src/tv.html b/src/tv.html index 3c15b61b8b..0840652c77 100644 --- a/src/tv.html +++ b/src/tv.html @@ -45,11 +45,9 @@
-