diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css index 6c31322269..175970f3af 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -416,12 +416,13 @@ button { } .overflowBackdropCard-scalable { - width: 80%; + width: 70%; max-width: 400px; } .overflowSquareCard-scalable { - width: 42%; + width: 40%; + max-width: 200px; } @media all and (min-width: 420px) { @@ -442,22 +443,29 @@ button { } } +@media all and (min-width: 540px) { + + .overflowPortraitCard-scalable { + width: 30%; + } + + .overflowBackdropCard-scalable { + width: 64%; + } + + .overflowSquareCard-scalable { + width: 30%; + } +} + @media all and (min-width: 640px) { .portraitCard-scalable { width: 25%; } - .overflowPortraitCard-scalable { - width: 36%; - } - .overflowBackdropCard-scalable { - width: 60%; - } - - .overflowSquareCard-scalable { - width: 30%; + width: 56%; } } @@ -504,7 +512,7 @@ button { } .overflowPortraitCard-scalable { - width: 23%; + width: 22%; } .overflowBackdropCard-scalable { diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 5f1293615d..4ce3387b19 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -144,28 +144,31 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo return 1; case 'overflowPortrait': if (screenWidth >= 1000) { - return 100 / 23; + return 100 / 22; } - if (screenWidth >= 640) { - return 100 / 36; + if (screenWidth >= 540) { + return 100 / 30; } - return 2.5; + return 100 / 40; case 'overflowSquare': if (screenWidth >= 1000) { return 100 / 22; } - if (screenWidth >= 640) { + if (screenWidth >= 540) { return 100 / 30; } - return 100 / 42; + return 100 / 40; case 'overflowBackdrop': if (screenWidth >= 1000) { return 100 / 40; } if (screenWidth >= 640) { - return 100 / 60; + return 100 / 56; } - return 100 / 84; + if (screenWidth >= 540) { + return 100 / 64; + } + return 100 / 70; default: return 4; } diff --git a/dashboard-ui/components/apphost.js b/dashboard-ui/components/apphost.js index 428919ae32..c81b2ab866 100644 --- a/dashboard-ui/components/apphost.js +++ b/dashboard-ui/components/apphost.js @@ -160,7 +160,7 @@ define(['appStorage', 'browser'], function (appStorage, browser) { var version = window.dashboardVersion || '3.0'; return { - dvrFeatureCode: Dashboard.isConnectMode() ? 'dvr' : 'dvr-l', + dvrFeatureCode: 'dvr', getWindowState: function () { return document.windowState || 'Normal'; }, diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 67410eccce..24f91594e1 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -862,14 +862,18 @@ var shape = item.Type == "MusicAlbum" || item.Type == "MusicArtist" ? getSquareShape() : getPortraitShape(); + var supportsImageAnalysis = appHost.supports('imageanalysis'); + html += cardBuilder.getCardsHtml({ items: result.Items, shape: shape, showParentTitle: item.Type == "MusicAlbum", - centerText: true, + centerText: !supportsImageAnalysis, showTitle: item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist", coverImage: item.Type == "MusicAlbum" || item.Type == "MusicArtist", - overlayPlayButton: true + overlayPlayButton: true, + cardLayout: supportsImageAnalysis, + vibrant: supportsImageAnalysis }); html += ''; @@ -928,17 +932,22 @@ } else { html += '
'; } + + var supportsImageAnalysis = appHost.supports('imageanalysis'); + html += cardBuilder.getCardsHtml({ items: result.Items, shape: shape, showParentTitle: item.Type == "MusicAlbum", - centerText: true, + centerText: !supportsImageAnalysis, showTitle: item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist", context: context, lazy: true, showDetailsMenu: true, coverImage: item.Type == "MusicAlbum" || item.Type == "MusicArtist", - overlayPlayButton: true + overlayPlayButton: true, + cardLayout: supportsImageAnalysis && (item.Type == "MusicAlbum" || item.Type == "Game" || item.Type == "MusicArtist"), + vibrant: supportsImageAnalysis }); html += '
';