diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 92ad29b82..c7a0dfbe5 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -284,9 +284,7 @@ } } - -@media all and (min-width: 640px) { - +@media all and (min-width: 700px) { .backdropCard { width: 33.3%; } @@ -296,7 +294,6 @@ } } - @media all and (min-width: 800px) { .squareCard { @@ -319,10 +316,6 @@ width: 20%; } - .backdropCard { - width: 25%; - } - .smallBackdropCard { width: 20%; } @@ -331,6 +324,10 @@ @media all and (min-width: 1200px) { + .backdropCard { + width: 25%; + } + .squareCard { width: 16.666666666666666666666666666667%; } @@ -483,15 +480,6 @@ } } - -@media all and (min-width: 600px) { - - .detailPageSquareCard { - width: 20%; - } -} - - /** homePageSmallBackdropCard */ .homePageSmallBackdropCard .cardPadder { padding-bottom: 56.25%; diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 32131bdf6..7fd62c529 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -384,7 +384,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .noBackdrop { height: auto; - margin: 2.5em 0 0; + margin: 3em 0 0; } .noBackdrop .itemBackdropContent { @@ -633,7 +633,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { .detailSection { vertical-align: top; - margin-bottom: 2em; + margin-bottom: 2.5em; } .detailCollapsibleSection:not(.hide) + .detailCollapsibleSection { @@ -664,7 +664,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .detailSectionHeader, .detailSectionHeader h3 { - font-size: 16px; + font-size: 17px; font-weight: 400; } @@ -754,13 +754,37 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { @media all and (max-width: 800px) { - .editorMenuLink { - display: none; + .itemBackdrop:not(.noBackdrop) { + height: 500px; } +} + +@media all and (max-height: 800px), (max-width: 700px) { + + .itemBackdrop:not(.noBackdrop) { + height: 400px; + } +} + +@media all and (max-height: 700px) { + + .itemBackdrop:not(.noBackdrop) { + height: 340px; + } +} + +@media all and (max-height: 600px), (max-width: 600px) { .itemBackdrop:not(.noBackdrop) { height: 280px; } +} + +@media all and (max-width: 800px) { + + .editorMenuLink { + display: none; + } .itemDetailImage { max-height: 240px; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index acf97b0bd..df4364685 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -12,6 +12,10 @@ margin: .5em 0; } +.headerBackButton { + padding-right: 0!important; +} + .viewMenuBar, .barsMenuButton, .libraryMenuButtonText, .btnCast { height: 50px; } @@ -50,7 +54,6 @@ } .headerButtonLeft { - float: left; padding: 0 15px; } diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index 224188f8b..b851d69b1 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -155,49 +155,49 @@ if (item.MovieCount) { html += ''; - html += ''; + html += ''; } if (item.SeriesCount) { html += ''; - html += ''; + html += ''; } if (item.EpisodeCount) { html += ''; - html += ''; + html += ''; } if (item.TrailerCount) { html += ''; - html += ''; + html += ''; } if (item.GameCount) { html += ''; - html += ''; + html += ''; } if (item.AlbumCount) { html += ''; - html += ''; + html += ''; } if (item.SongCount) { html += ''; - html += ''; + html += ''; } if (item.MusicVideoCount) { html += ''; - html += ''; + html += ''; } html += ''; @@ -385,7 +385,7 @@ } } - function getItemsFunction(options) { + function getQuery(options) { var query = { @@ -407,6 +407,13 @@ addCurrentItemToQuery(query); + return query; + } + + function getItemsFunction(options) { + + var query = getQuery(options); + return function (index, limit, fields) { query.StartIndex = index; @@ -424,27 +431,10 @@ Dashboard.showLoadingMsg(); _childrenItemsFunction = getItemsFunction(options); - var query = { - SortBy: "SortName", - SortOrder: "Ascending", - IncludeItemTypes: "", - Recursive: true, - Fields: "AudioInfo,SeriesInfo,ParentId,PrimaryImageAspectRatio,SyncInfo", - Limit: LibraryBrowser.getDefaultPageSize(), - StartIndex: 0, - CollapseBoxSetItems: false - }; + var query = getQuery(options); - query = $.extend(query, options || {}); - - if (query.IncludeItemTypes == "Audio") { - query.SortBy = "AlbumArtist,Album,SortName"; - } - - addCurrentItemToQuery(query); - - ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) { + getItemsFunction(options)(options.StartIndex, options.Limit, options.Fields).done(function (result) { var html = ''; diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 4042514cd..edf5e8ea7 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -630,6 +630,7 @@ promise = ApiClient.getSimilarTrailers(item.Id, options); } else if (item.Type == "MusicAlbum") { + options.limit = 4; promise = ApiClient.getSimilarAlbums(item.Id, options); } else if (item.Type == "Series") { diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 1b0e42dbb..9ff277904 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -4,6 +4,10 @@ var html = '
'; + if ($.browser.safari && $.browser.mobile && window.navigator.standalone) { + html += '
'; + } + html += '