diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css
index 6b6a5eb8c7..b9f406bc0d 100644
--- a/src/assets/css/librarybrowser.css
+++ b/src/assets/css/librarybrowser.css
@@ -521,8 +521,7 @@
top: 50%;
left: 50%;
margin: -2.2em 0 0 -2.2em;
- border: 2.7px solid rgba(255, 255, 255, .6);
- padding: .38em !important;
+ padding: 0.4em !important;
color: rgba(255, 255, 255, .76)
}
diff --git a/src/themes/logodark.png b/src/assets/img/banner-dark.png
similarity index 100%
rename from src/themes/logodark.png
rename to src/assets/img/banner-dark.png
diff --git a/src/themes/logowhite.png b/src/assets/img/banner-light.png
similarity index 100%
rename from src/themes/logowhite.png
rename to src/assets/img/banner-light.png
diff --git a/src/assets/img/logo.png b/src/assets/img/icon-transparent.png
similarity index 100%
rename from src/assets/img/logo.png
rename to src/assets/img/icon-transparent.png
diff --git a/src/components/logoscreensaver/plugin.js b/src/components/logoscreensaver/plugin.js
index 521afd2690..0eb5e85d31 100644
--- a/src/components/logoscreensaver/plugin.js
+++ b/src/components/logoscreensaver/plugin.js
@@ -160,7 +160,7 @@ define(["pluginManager"], function (pluginManager) {
elem.classList.add("logoScreenSaver");
document.body.appendChild(elem);
- elem.innerHTML = '
';
+ elem.innerHTML = '';
}
stopInterval();
diff --git a/src/components/skinManager.js b/src/components/skinManager.js
index 06125e947a..b757aab3d6 100644
--- a/src/components/skinManager.js
+++ b/src/components/skinManager.js
@@ -34,15 +34,12 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
id: "dark",
isDefault: true,
isDefaultServerDashboard: true
- }, {
- name: "Emby",
- id: "emby"
}, {
name: "Light",
id: "light"
}, {
name: "Purple Haze",
- id: "purple-haze"
+ id: "purplehaze"
}, {
name: "Windows Media Center",
id: "wmc"
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index a1129599e1..dcf47b5b3c 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -424,7 +424,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
return getToolsMenuHtml(apiClient).then(function (toolsMenuHtml) {
var html = "";
html += '';
- html += '
';
+ html += '
';
html += "";
html += toolsMenuHtml;
navDrawerScrollContainer.innerHTML = html;
diff --git a/src/themes/appletv/theme.css b/src/themes/appletv/theme.css
index acc7ef8210..4b694d6ece 100644
--- a/src/themes/appletv/theme.css
+++ b/src/themes/appletv/theme.css
@@ -31,7 +31,7 @@ html {
}
.pageTitleWithDefaultLogo {
- background-image: url(../logodark.png)
+ background-image: url(assets/img/banner-dark.png)
}
html {
diff --git a/src/themes/blueradiance/theme.css b/src/themes/blueradiance/theme.css
index cd1999702e..5ab67ca317 100644
--- a/src/themes/blueradiance/theme.css
+++ b/src/themes/blueradiance/theme.css
@@ -27,7 +27,7 @@ html {
}
.pageTitleWithDefaultLogo {
- background-image: url(../logowhite.png)
+ background-image: url(assets/img/banner-light.png)
}
.dialog,
diff --git a/src/themes/dark/theme.css b/src/themes/dark/theme.css
index 1bcf3af28f..bff054169d 100644
--- a/src/themes/dark/theme.css
+++ b/src/themes/dark/theme.css
@@ -25,7 +25,7 @@ html {
}
.pageTitleWithDefaultLogo {
- background-image: url(../logowhite.png)
+ background-image: url(assets/img/banner-light.png)
}
.backgroundContainer,
diff --git a/src/themes/emby/theme.css b/src/themes/emby/theme.css
deleted file mode 100644
index 15c329ce7d..0000000000
--- a/src/themes/emby/theme.css
+++ /dev/null
@@ -1,432 +0,0 @@
-.skinHeader,
-html {
- color: #ddd;
- color: rgba(255, 255, 255, .8)
-}
-
-.wizardStartForm,
-.ui-corner-all,
-.ui-shadow {
- background-color: #1f1f1f
-}
-
-.emby-collapsible-button {
- border-color: #383838;
- border-color: rgba(255, 255, 255, .135)
-}
-
-.skinHeader-withBackground {
- background-color: #1f1f1f
-}
-
-.skinHeader.semiTransparent {
- backdrop-filter: none !important;
- background-color: rgba(0, 0, 0, 0.4);
-}
-
-.pageTitleWithDefaultLogo {
- background-image: url(../logowhite.png)
-}
-
-.backgroundContainer,
-.dialog,
-html {
- background-color: #1a1a1a
-}
-
-.backgroundContainer.withBackdrop {
- background-color: rgba(0, 0, 0, .86)
-}
-
-.paper-icon-button-light:hover:not(:disabled) {
- color: #52b54b;
- background-color: rgba(82, 181, 75, .2);
-}
-
-.paper-icon-button-light.show-focus:focus {
- color: #52b54b;
-}
-
-.fab,
-.raised {
- background: #303030;
- color: rgba(255, 255, 255, .87)
-}
-
-.fab:focus,
-.raised:focus {
- background: #383838
-}
-
-.button-submit {
- background: #52b54b;
- color: #fff
-}
-
-.button-submit:focus {
- background: #5EC157;
- color: #fff
-}
-
-.button-delete {
- background: rgb(247, 0, 0);
- color: rgba(255, 255, 255, .87)
-}
-
-.checkboxLabel {
- color: inherit
-}
-
-.checkboxListLabel,
-.inputLabel,
-.inputLabelUnfocused,
-.paperListLabel,
-.textareaLabelUnfocused {
- color: #bbb;
- color: rgba(255, 255, 255, .7)
-}
-
-.inputLabelFocused,
-.selectLabelFocused,
-.textareaLabelFocused {
- color: #52b54b
-}
-
-.checkboxOutline {
- border-color: currentColor
-}
-
-.collapseContent,
-.formDialogFooter:not(.formDialogFooter-clear),
-.formDialogHeader:not(.formDialogHeader-clear),
-.paperList,
-.visualCardBox {
- background-color: #242424
-}
-
-.defaultCardBackground1 {
- background-color: #d2b019
-}
-
-.defaultCardBackground2 {
- background-color: #338abb
-}
-
-.defaultCardBackground3 {
- background-color: #6b689d
-}
-
-.defaultCardBackground4 {
- background-color: #dd452b
-}
-
-.defaultCardBackground5 {
- background-color: #5ccea9
-}
-
-.cardText-secondary,
-.fieldDescription,
-.guide-programNameCaret,
-.listItem .secondary,
-.nowPlayingBarSecondaryText,
-.programSecondaryTitle,
-.secondaryText {
- color: #999;
- color: rgba(255, 255, 255, .5)
-}
-
-.actionsheetDivider {
- background: #444;
- background: rgba(255, 255, 255, .14)
-}
-
-.cardFooter-vibrant .cardText-secondary {
- color: inherit;
- opacity: .5
-}
-
-.actionSheetMenuItem:hover {
- background-color: #242424
-}
-
-.toast {
- background: #303030;
- color: #fff;
- color: rgba(255, 255, 255, .87)
-}
-
-.appfooter {
- background: #101010;
- color: #ccc;
- color: rgba(255, 255, 255, .78)
-}
-
-.itemSelectionPanel {
- border: 1px solid #52b54b
-}
-
-.selectionCommandsPanel {
- background: #52b54b;
- color: #fff
-}
-
-.upNextDialog-countdownText {
- color: #52b54b
-}
-
-.alphaPickerButton {
- color: #999;
- color: rgba(255, 255, 255, .5);
- background-color: transparent
-}
-
-.alphaPickerButton-selected {
- color: #fff
-}
-
-.alphaPickerButton-tv:focus {
- background-color: #52b54b;
- color: #fff !important
-}
-
-.detailTableBodyRow-shaded:nth-child(even) {
- background: #1c1c1c;
- background: rgba(30, 30, 30, .9)
-}
-
-.listItem-border {
- border-color: rgba(34, 34, 34, .9) !important
-}
-
-.listItem:focus {
- background: #333
-}
-
-.progressring-spiner {
- border-color: #52b54b
-}
-
-.button-flat-accent,
-.button-link {
- color: #52b54b
-}
-
-.mediaInfoText {
- color: #ddd;
- background: rgba(170, 170, 190, .2)
-}
-
-.mediaInfoTimerIcon,
-.starIcon {
- color: #CB272A
-}
-
-.emby-input,
-.emby-textarea {
- color: inherit;
- background: #292929;
- border: .07em solid #292929;
- border-radius: .15em
-}
-
-.emby-input:focus,
-.emby-textarea:focus {
- border-color: #52b54b
-}
-
-.emby-select-withcolor {
- color: inherit;
- background: #292929;
- border: .07em solid #292929
-}
-
-.emby-select-withcolor>option {
- color: inherit;
- background: #222
-}
-
-.emby-select-withcolor:focus {
- border-color: #52b54b !important
-}
-
-.emby-select-tv-withcolor:focus {
- background-color: #52b54b !important;
- color: #fff !important
-}
-
-.emby-checkbox:checked+span+.checkboxOutline {
- border-color: #52b54b
-}
-
-.emby-checkbox:focus+span+.checkboxOutline {
- border-color: #fff;
-}
-
-.emby-checkbox:focus:not(:checked)+span+.checkboxOutline {
- border-color: #52b54b;
-}
-
-.emby-checkbox:checked+span+.checkboxOutline,
-.itemProgressBarForeground {
- background-color: #52b54b
-}
-
-.itemProgressBarForeground-recording {
- background-color: #CB272A
-}
-
-.countIndicator,
-.fullSyncIndicator,
-.playedIndicator {
- background: #52b54b
-}
-
-.fullSyncIndicator {
- color: #fff
-}
-
-.mainDrawer {
- background-color: #1c1c1c
-}
-
-.navMenuOption:hover {
- background: #252528
-}
-
-.navMenuOption-selected {
- background: #52b54b !important;
- color: #fff
-}
-
-.emby-button.show-focus:focus {
- background: #52b54b;
- color: #fff
-}
-
-.emby-tab-button {
- color: #999;
-}
-
-.emby-tab-button-active {
- color: #52b54b;
-}
-
-.emby-tab-button.show-focus:focus {
- color: #52b54b;
-}
-
-.emby-tab-button:hover {
- color: #52b54b;
-}
-
-.channelPrograms,
-.guide-channelHeaderCell,
-.programCell {
- border-color: rgba(255, 255, 255, .05)
-}
-
-.programCell-sports {
- background: #3949AB !important
-}
-
-.programCell-movie {
- background: #5E35B1 !important
-}
-
-.programCell-kids {
- background: #039BE5 !important
-}
-
-.programCell-news {
- background: #43A047 !important
-}
-
-.programCell-active {
- background: #1e1e1e !important
-}
-
-.guide-channelHeaderCell:focus,
-.programCell:focus {
- background-color: #52b54b !important;
- color: #fff !important
-}
-
-.guide-programTextIcon {
- color: #1e1e1e;
- background: #555
-}
-
-.guide-headerTimeslots {
- color: inherit
-}
-
-.guide-date-tab-button {
- color: #555;
- color: rgba(255, 255, 255, .3)
-}
-
-.guide-date-tab-button.emby-tab-button-active,
-.guide-date-tab-button:focus {
- color: #52b54b
-}
-
-.guide-date-tab-button.show-focus:focus {
- background-color: #52b54b;
- color: #fff
-}
-
-.infoBanner {
- color: #ddd;
- background: #111;
- padding: 1em;
- border-radius: .25em
-}
-
-.ratingbutton-icon-withrating {
- color: #c33
-}
-
-.downloadbutton-icon-complete,
-.downloadbutton-icon-on {
- color: #4285F4
-}
-
-.playstatebutton-icon-played {
- color: #c33
-}
-
-.repeatButton-active {
- color: #4285F4
-}
-
-.card:focus .cardBox.visualCardBox,
-.card:focus .cardBox:not(.visualCardBox) .cardScalable {
- border-color: #52b54b !important
-}
-
-.layout-desktop ::-webkit-scrollbar {
- width: 1em;
- height: 1em
-}
-
-::-webkit-scrollbar-track {
- box-shadow: inset 0 0 6px rgba(0, 0, 0, .3)
-}
-
-::-webkit-scrollbar-track-piece {
- background-color: #3b3b3b
-}
-
-::-webkit-scrollbar-thumb:horizontal,
-::-webkit-scrollbar-thumb:vertical {
- border-radius: 2px;
- background: center no-repeat #888
-}
-
-.timeslotHeaders-desktop::-webkit-scrollbar {
- height: .7em
-}
-
-.metadataSidebarIcon {
- color: #00a4dc
-}
diff --git a/src/themes/light/theme.css b/src/themes/light/theme.css
index 9f97054f34..719678d0a6 100644
--- a/src/themes/light/theme.css
+++ b/src/themes/light/theme.css
@@ -36,7 +36,7 @@ html {
}
.pageTitleWithDefaultLogo {
- background-image: url(../logowhite.png)
+ background-image: url(assets/img/banner-light.png)
}
.backgroundContainer,
diff --git a/src/themes/purple-haze/bg.jpg b/src/themes/purplehaze/bg.jpg
similarity index 100%
rename from src/themes/purple-haze/bg.jpg
rename to src/themes/purplehaze/bg.jpg
diff --git a/src/themes/purple-haze/theme.css b/src/themes/purplehaze/theme.css
similarity index 99%
rename from src/themes/purple-haze/theme.css
rename to src/themes/purplehaze/theme.css
index fb871b59f5..c53e80e80a 100644
--- a/src/themes/purple-haze/theme.css
+++ b/src/themes/purplehaze/theme.css
@@ -27,7 +27,7 @@ html {
}
.pageTitleWithDefaultLogo {
- background-image: url(../logowhite.png)
+ background-image: url(assets/img/banner-light.png)
}
.dialog,
diff --git a/src/themes/wmc/theme.css b/src/themes/wmc/theme.css
index 1f417b1706..e51f4311ef 100644
--- a/src/themes/wmc/theme.css
+++ b/src/themes/wmc/theme.css
@@ -33,7 +33,7 @@ html {
}
.pageTitleWithDefaultLogo {
- background-image: url(../logowhite.png)
+ background-image: url(assets/img/banner-light.png)
}
.backgroundContainer,