diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 85bad26b6b..5aa3524a9c 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -619,21 +619,21 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
display: none;
}
-.libraryPage ::-webkit-scrollbar {
+.darkScrollbars ::-webkit-scrollbar {
width: 12px;
height: 12px;
}
-.libraryPage ::-webkit-scrollbar-button:start:decrement,
-.libraryPage ::-webkit-scrollbar-button:end:increment {
+.darkScrollbars ::-webkit-scrollbar-button:start:decrement,
+.darkScrollbars ::-webkit-scrollbar-button:end:increment {
display: none;
}
-.libraryPage ::-webkit-scrollbar-track-piece {
+.darkScrollbars ::-webkit-scrollbar-track-piece {
background-color: #3b3b3b;
}
-.libraryPage ::-webkit-scrollbar-thumb:vertical, .libraryPage ::-webkit-scrollbar-thumb:horizontal {
+.darkScrollbars ::-webkit-scrollbar-thumb:vertical, .darkScrollbars ::-webkit-scrollbar-thumb:horizontal {
-webkit-border-radius: 2px;
background: #888 no-repeat center;
}
diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css
index f38e0e8308..afe5a99e28 100644
--- a/dashboard-ui/css/mediaplayer-video.css
+++ b/dashboard-ui/css/mediaplayer-video.css
@@ -74,9 +74,8 @@
}
.nowPlayingInfo {
- text-align: center;
- padding: 1em 1em 0 1em;
-
+ text-align: center;
+ padding: 1em 1em 2em 1em;
}
#videoPlayer .nowPlayingImage img {
@@ -85,6 +84,56 @@
max-height: 200px;
}
+#videoPlayer .nowPlayingTabs {
+ margin: 0 0 0 1em;
+ overflow: hidden;
+ white-space: normal;
+ text-overflow: ellipsis;
+ text-align: left;
+ vertical-align: top;
+ color: #eee;
+ display: inline-block;
+ width: 80%;
+ font-weight: normal;
+ font-size: 15px;
+}
+
+@media all and (max-width: 1200px) {
+ #videoPlayer .nowPlayingTabs {
+ font-size: 13px;
+ }
+}
+
+.nowPlayingTabButtons {
+ margin-bottom: 1.25em;
+}
+
+.nowPlayingTabButton {
+ display: inline-block;
+ font-size: 18px;
+ text-transform: uppercase;
+ color: #ddd !important;
+ font-weight: 500 !important;
+ text-decoration: none;
+}
+
+ .nowPlayingTabButton + .nowPlayingTabButton {
+ padding-left: 1.5em;
+ }
+
+ .nowPlayingTabButton:not(.selectedNowPlayingTabButton):hover {
+ color: white !important;
+ }
+
+.selectedNowPlayingTabButton {
+ color: #2ad !important;
+}
+
+.nowPlayingTab {
+ overflow-y: hidden;
+ overflow-x: auto;
+}
+
#videoPlayer .nowPlayingText {
font-weight: normal;
margin: 0 0 0 1em;
@@ -96,7 +145,6 @@
vertical-align: top;
position: static;
color: #eee;
- max-width: 80%;
}
.videoNowPlayingName {
@@ -173,10 +221,10 @@
}
}
-@media all and (max-width: 1000px), all and (max-height: 600px) {
+@media all and (max-width: 800px), all and (max-height: 600px) {
- #mediaPlayer .nowPlayingImage, #mediaPlayer .nowPlayingText {
- display: none;
+ #mediaPlayer .nowPlayingInfo {
+ display: none !important;
}
}
@@ -197,10 +245,14 @@
}
@media all and (min-width: 1300px) {
+ .nowPlayingInfo {
+ padding-bottom: 0;
+ }
+
#videoPlayer .nowPlayingImage img {
height: auto !important;
max-width: 400px;
- max-height: 250px;
+ max-height: 280px;
}
}
diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css
index d8cd0a49ab..f2b54d72b6 100644
--- a/dashboard-ui/css/tileitem.css
+++ b/dashboard-ui/css/tileitem.css
@@ -1,5 +1,5 @@
.tileItem {
- background: #1e1e1e;
+ background: rgba(30, 30, 30, .7);
padding: 10px 7px 5px;
margin: 3px 0;
font-weight: normal !important;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index af2bfc65c3..b58187b362 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1405,10 +1405,6 @@
var cssClass = "card";
- if (options.transparent !== false) {
- cssClass += " transparentCard";
- }
-
cssClass += ' ' + options.shape + 'Card';
var mediaSourceCount = item.MediaSourceCount || 1;
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 7d2493ea42..dda658701c 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -291,7 +291,7 @@
var url = "";
var imageWidth = 400;
- var imageHeight = 250;
+ var imageHeight = 280;
if (state.NowPlayingItem.PrimaryImageTag) {
@@ -328,9 +328,6 @@
});
}
- var nowPlayingTextElement = $('.nowPlayingText', mediaControls);
- var nameHtml = MediaController.getNowPlayingNameHtml(state.NowPlayingItem, false);
-
if (url) {
$('.nowPlayingImage', mediaControls).html('');
} else {
@@ -350,6 +347,44 @@
$('.videoTopControlsLogo', mediaControls).html('');
}
+ var elem = $('.nowPlayingTabs', mediaControls).html(getNowPlayingTabsHtml(item)).lazyChildren();
+
+ $('.nowPlayingTabButton', elem).on('click', function () {
+
+ if (!$(this).hasClass('selectedNowPlayingTabButton')) {
+ $('.selectedNowPlayingTabButton').removeClass('selectedNowPlayingTabButton');
+ $(this).addClass('selectedNowPlayingTabButton');
+ $('.nowPlayingTab').hide();
+ $('.' + this.getAttribute('data-tab')).show('slide').trigger('scroll');
+ }
+ });
+
+ $('.chapterCard', elem).on('click', function () {
+
+ self.seek(parseInt(this.getAttribute('data-position')));
+ });
+ };
+
+ function getNowPlayingTabsHtml(item) {
+
+ var html = '';
+
+ html += '