mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

fix playlist deletion

Browse source
This commit is contained in:
Luke Pulverenti 2016-10-13 14:43:47 -04:00
parent 25190fbcec
commit 793cf35f42
4 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css vendored
View file

@ -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 {

19
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View file

@ -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;
}

2
dashboard-ui/components/apphost.js
View file

@ -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';
},

17
dashboard-ui/scripts/itemdetailpage.js
View file

@ -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 += '</div>';
@ -928,17 +932,22 @@
} else {
html += '<div is="emby-itemscontainer" class="itemsContainer vertical-wrap">';
}
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 += '</div>';