diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index ae5c921c38..5886638902 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -105,7 +105,7 @@ } .listHeader { - margin-top: .5em; + margin-top: .75em; margin-bottom: 0; padding-left: 7px; } @@ -784,13 +784,13 @@ a.itemTag:hover { @media all and (min-width: 1440px) { .ehsContent { - max-width: 950px; + max-width: 1240px; } } @media all and (min-width: 1920px) { .ehsContent { - max-width: 1260px; + max-width: 1540px; } } diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js index 74ac2c6719..dafd201a73 100644 --- a/dashboard-ui/scripts/metadataimagespage.js +++ b/dashboard-ui/scripts/metadataimagespage.js @@ -531,35 +531,17 @@ }); - if ($('.backdropFields:visible', form).length) { + config.ImageOptions.push({ + Type: 'Backdrop', + Limit: $('#txtMaxBackdrops', form).val(), + MinWidth: $('#txtMinBackdropDownloadWidth', form).val() + }); - config.ImageOptions.push({ - Type: 'Backdrop', - Limit: $('#txtMaxBackdrops', form).val(), - MinWidth: $('#txtMinBackdropDownloadWidth', form).val() - }); - } else { - config.ImageOptions.push({ - Type: 'Backdrop', - Limit: 0, - MinWidth: 0 - }); - } - - if ($('.screenshotFields:visible', form).length) { - - config.ImageOptions.push({ - Type: 'Screenshot', - Limit: $('#txtMaxScreenshots', form).val(), - MinWidth: $('#txtMinScreenshotDownloadWidth', form).val() - }); - } else { - config.ImageOptions.push({ - Type: 'Screenshot', - Limit: 0, - MinWidth: 0 - }); - } + config.ImageOptions.push({ + Type: 'Screenshot', + Limit: $('#txtMaxScreenshots', form).val(), + MinWidth: $('#txtMinScreenshotDownloadWidth', form).val() + }); } function onSubmit() { diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js index 8a63dbf4bd..5d42ad64af 100644 --- a/dashboard-ui/scripts/moviesrecommended.js +++ b/dashboard-ui/scripts/moviesrecommended.js @@ -11,7 +11,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "Movie", - Limit: screenWidth >= 1920 ? 14 : 12, + Limit: screenWidth >= 1440 ? 16 : 12, Recursive: true, Fields: "PrimaryImageAspectRatio,DateCreated,UserData", Filters: "IsUnplayed" @@ -33,7 +33,7 @@ SortOrder: "Descending", IncludeItemTypes: "Movie", Filters: "IsResumable", - Limit: screenWidth >= 1920 ? 4 : 3, + Limit: screenWidth >= 1920 ? 5 : (screenWidth >= 1440 ? 4 : 3), Recursive: true, Fields: "DateCreated,UserData" }; @@ -63,7 +63,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "Trailer", - Limit: screenWidth >= 1920 ? 7 : 6, + Limit: screenWidth >= 1440 ? 8 : 6, Recursive: true, Fields: "PrimaryImageAspectRatio,DateCreated,UserData", Filters: "IsUnplayed" diff --git a/dashboard-ui/scripts/musicrecommended.js b/dashboard-ui/scripts/musicrecommended.js index a5b9bdf73f..489f226e1f 100644 --- a/dashboard-ui/scripts/musicrecommended.js +++ b/dashboard-ui/scripts/musicrecommended.js @@ -2,6 +2,8 @@ $(document).on('pagebeforeshow', "#musicRecommendedPage", function () { + var screenWidth = $(window).width(); + var page = this; var options = { @@ -9,7 +11,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "MusicAlbum", - Limit: 5, + Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 6 : 5), Recursive: true, Fields: "PrimaryImageAspectRatio" }; @@ -32,7 +34,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: 5, + Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 6 : 5), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo" }; @@ -55,7 +57,7 @@ SortBy: "DatePlayed", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: 5, + Limit: screenWidth >= 1920 ? 7 : (screenWidth >= 1440 ? 6 : 5), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo", Filters: "IsPlayed" @@ -85,7 +87,7 @@ SortBy: "PlayCount", SortOrder: "Descending", IncludeItemTypes: "Audio", - Limit: 10, + Limit: screenWidth >= 1920 ? 14 : (screenWidth >= 1440 ? 12 : 10), Recursive: true, Fields: "PrimaryImageAspectRatio,AudioInfo", Filters: "IsPlayed" diff --git a/dashboard-ui/scripts/tvnextup.js b/dashboard-ui/scripts/tvnextup.js index 26319fa74b..622c46a965 100644 --- a/dashboard-ui/scripts/tvnextup.js +++ b/dashboard-ui/scripts/tvnextup.js @@ -2,11 +2,13 @@ $(document).on('pagebeforeshow', "#tvNextUpPage", function () { + var screenWidth = $(window).width(); + var page = this; var options = { - Limit: 24, + Limit: screenWidth >= 1920 ? 25 : 24, Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated", UserId: Dashboard.getCurrentUserId(), ExcludeLocationTypes: "Virtual" diff --git a/dashboard-ui/scripts/tvrecommended.js b/dashboard-ui/scripts/tvrecommended.js index 05e378bea0..11f6fe1bdb 100644 --- a/dashboard-ui/scripts/tvrecommended.js +++ b/dashboard-ui/scripts/tvrecommended.js @@ -2,6 +2,8 @@ $(document).on('pagebeforeshow', "#tvRecommendedPage", function () { + var screenWidth = $(window).width(); + var page = this; var options = { @@ -9,7 +11,7 @@ SortBy: "DateCreated", SortOrder: "Descending", IncludeItemTypes: "Episode", - Limit: 15, + Limit: screenWidth >= 1920 ? 20 : (screenWidth >= 1440 ? 16 : 15), Recursive: true, Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData", Filters: "IsUnplayed", @@ -36,7 +38,7 @@ SortOrder: "Descending", IncludeItemTypes: "Episode", Filters: "IsResumable", - Limit: 3, + Limit: screenWidth >= 1920 ? 5 : (screenWidth >= 1440 ? 4 : 3), Recursive: true, Fields: "PrimaryImageAspectRatio,SeriesInfo,UserData", ExcludeLocationTypes: "Virtual" diff --git a/dashboard-ui/thirdparty/jstree1.0/themes/mb3/style.css b/dashboard-ui/thirdparty/jstree1.0/themes/mb3/style.css index cc69202242..797849b73f 100644 --- a/dashboard-ui/thirdparty/jstree1.0/themes/mb3/style.css +++ b/dashboard-ui/thirdparty/jstree1.0/themes/mb3/style.css @@ -6,6 +6,7 @@ .jstree-mb3 li, .jstree-mb3 ins {cursor: pointer; background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; } +.jstree-mb3 ins {position: relative;top: 6px; } .jstree-mb3 li { background-position:-90px 0; background-repeat:repeat-y; } .jstree-mb3 li.jstree-last { background:transparent; } .jstree-mb3 .jstree-open > ins { background-position:-72px 0; } @@ -76,9 +77,9 @@ } .jstree li:last-child { - border-bottom: 0; + border-color: transparent; } -.jstree li { min-height:28px; line-height:28px; } -.jstree a { line-height:28px; height:28px; } +.jstree li { min-height:32px; line-height:32px; } +.jstree a { line-height:32px; height:32px; } .jstree a ins { height:28px; width:28px; }