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

merge branch master into remove-prefixes

Browse source
This commit is contained in:
dkanada 2020-01-06 21:22:49 +09:00
commit 34b155cbae
75 changed files with 3529 additions and 532 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/components/cardbuilder/card.css
View file

@ -243,7 +243,7 @@ button {
}
.coveredImage {
background-size: 100% 100%;
background-size: cover;
background-position: center center;
}
@ -622,7 +622,7 @@ button {
@media (min-width: 43.75em) {
.overflowSquareCard, .overflowPortraitCard {
width: 23.3vw;
width: 23.1vw;
}
}
@ -638,13 +638,13 @@ button {
}
.overflowSquareCard, .overflowPortraitCard {
width: 23.3vw;
width: 23.1vw;
}
}
@media (orientation: landscape) and (min-width: 48.125em) {
.overflowBackdropCard, .overflowSmallBackdropCard {
width: 23.3vw;
width: 23.1vw;
}
}
@ -656,13 +656,13 @@ button {
@media (min-width: 50em) {
.overflowSquareCard, .overflowPortraitCard {
width: 18.4vw;
width: 18.5vw;
}
}
@media (min-width: 75em) {
.overflowBackdropCard, .overflowSmallBackdropCard {
width: 23.3vw;
width: 23.1vw;
}
.overflowSquareCard, .overflowPortraitCard {

2
src/components/cardbuilder/cardBuilder.js
View file

@ -893,7 +893,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
if (item.EndDate && item.ProductionYear) {
var endYear = datetime.parseISO8601Date(item.EndDate).getFullYear();
lines.push(item.ProductionYear + (endYear === item.ProductionYear) ? '' : (' - ' + endYear));
lines.push(item.ProductionYear + ((endYear === item.ProductionYear) ? '' : (' - ' + endYear)));
} else {
lines.push(item.ProductionYear || '');
}