diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 92ad29b820..c06aafd497 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -275,10 +275,6 @@ @media all and (min-width: 540px) { - .portraitCard { - width: 25%; - } - .smallBackdropCard { width: 33.3%; } @@ -287,6 +283,12 @@ @media all and (min-width: 640px) { + .portraitCard { + width: 25%; + } +} + +@media all and (min-width: 700px) { .backdropCard { width: 33.3%; } @@ -296,7 +298,6 @@ } } - @media all and (min-width: 800px) { .squareCard { @@ -319,10 +320,6 @@ width: 20%; } - .backdropCard { - width: 25%; - } - .smallBackdropCard { width: 20%; } @@ -331,6 +328,10 @@ @media all and (min-width: 1200px) { + .backdropCard { + width: 25%; + } + .squareCard { width: 16.666666666666666666666666666667%; } @@ -483,15 +484,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 32131bdf6c..7fd62c5291 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 acf97b0bd3..5f26e2072f 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -8,10 +8,14 @@ .libraryMenuDivider { height: 1px; - background: #333; + background: #282828; margin: .5em 0; } +.headerBackButton { + padding-right: 0 !important; +} + .viewMenuBar, .barsMenuButton, .libraryMenuButtonText, .btnCast { height: 50px; } @@ -50,7 +54,6 @@ } .headerButtonLeft { - float: left; padding: 0 15px; } @@ -176,22 +179,22 @@ vertical-align: top; } -.librarySidebarLinks a { - font-weight: 300 !important; +.librarySidebarLinks { + margin-left: -1em; + margin-right: -1em; + margin-top: -1em; + padding-top: 0; } - .librarySidebarLinks a:hover { - background-color: #38c !important; - color: #fff !important; + .librarySidebarLinks a { + font-weight: 300 !important; + padding: .7em 20px .7em 0; } -.homeViewMenu { - background-image: url(images/mblogoicon.png) !important; - background-size: 39px 26px !important; - background-position: 13px center !important; - padding-left: 66px !important; - background-repeat: no-repeat !important; -} + .librarySidebarLinks a:hover { + background-color: #38c !important; + color: #fff !important; + } .viewMenuSecondary { position: absolute; @@ -210,7 +213,7 @@ } .ui-panel.ui-body-b { - background-color: #222; + background-color: #161616; } .libraryViewNav .ui-btn-active { diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index b523c4199b..14cbd735bb 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -130,8 +130,8 @@ } /* Hack for safari because it doesn't allow clickable content over the video surface. */ -.itemVideo { (;top: 9%!important;height: 91% !important;); } -.itemVideo { [;top: 9%!important;height: 91% !important;]; } +/*.itemVideo { (;top: 9%!important;height: 91% !important;); } +.itemVideo { [;top: 9%!important;height: 91% !important;]; }*/ #mediaPlayer .ui-slider-track, .nowPlayingBar .ui-slider-track, .nowPlayingPage .ui-slider-track { border-color: #2ad !important; diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index a9cec93db7..74d6cd9b9a 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -35,11 +35,11 @@ /* latin */ @font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - src: local('Montserrat-Regular'), url(fonts/Montserrat.woff) format('woff'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; + font-family: 'Montserrat'; + font-style: normal; + font-weight: 400; + src: local('Montserrat-Regular'), url(fonts/Montserrat.woff) format('woff'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; } /* For some reason jquery mobile 1.4.5 wants to horitontally pad mini form fields. */ @@ -156,6 +156,12 @@ h1 a:hover { display: none; } +.ui-slider-track.ui-mini .ui-slider-handle { + height: 18px; + width: 18px; + margin: -10px 0 0 -10px; +} + .largePanel { width: 270px; } @@ -382,6 +388,7 @@ h1 .imageLink { font-size: 17px; width: 66px; text-align: center; + vertical-align: middle; } .ui-page-theme-a .sidebarLinkIcon { diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index f0c76ed506..a8737d9935 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -110,6 +110,12 @@ ${TabStudios} + diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html index 4e9c4ab24e..0288827fa8 100644 --- a/dashboard-ui/mypreferenceswebclient.html +++ b/dashboard-ui/mypreferenceswebclient.html @@ -121,6 +121,35 @@
+
+ + +
+
'; - 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 ed46d1b2d5..edf5e8ea70 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -282,6 +282,9 @@ $('.lnkMovies', page).addClass('ui-btn-active'); } } + else if (context == 'channels') { + elem = $('.channelTabs', page).show(); + } else if (item.Type == "MusicAlbum") { $('#albumTabs', page).show(); } @@ -627,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") { @@ -1314,7 +1318,7 @@ if (stream.ChannelLayout) { attributes.push(createAttribute(Globalize.translate('MediaInfoLayout'), stream.ChannelLayout)); } - else if (stream.Channels) { + if (stream.Channels) { attributes.push(createAttribute(Globalize.translate('MediaInfoChannels'), stream.Channels + ' ch')); } diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index c80a599e99..2d1b8da192 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 += '