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

limit transcoding to level 41

This commit is contained in:
Luke Pulverenti 2016-09-07 22:55:54 -04:00
parent 1eb2690523
commit 4229e36361
15 changed files with 33 additions and 38 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.228",
"_release": "1.4.228",
"version": "1.4.229",
"_release": "1.4.229",
"_resolution": {
"type": "version",
"tag": "1.4.228",
"commit": "1cfdbd2cf131d65f407bb004f8840f8b0cb929ea"
"tag": "1.4.229",
"commit": "aaee0b2e654b9007116e9b4eb5b5b86dd39d323b"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -92,6 +92,6 @@
.btnCloseActionSheet {
position: fixed;
top: .5em;
left: .25em;
top: .75em;
left: .5em;
}

View file

@ -851,7 +851,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
if (options.showCurrentProgram && item.Type == 'TvChannel') {
if (item.CurrentProgram) {
lines.push(itemHelper.getDisplayName(item.CurrentProgram));
lines.push(item.CurrentProgram.Name);
} else {
lines.push('');
}

View file

@ -35,7 +35,7 @@
};
if (layoutManager.tv) {
dialogOptions.size = 'fullscreen';
dialogOptions.size = 'medium';
} else {
dialogOptions.size = 'small';
}

View file

@ -46,10 +46,10 @@
.guideProgramIndicator {
text-transform: uppercase;
border-radius: .3em;
border-radius: 2px;
margin-right: .5em;
color: #fff;
font-size: 82%;
font-size: 80%;
padding: .2em .25em;
display: inline-flex;
align-items: center;
@ -367,6 +367,8 @@
padding: 0 .5em 0;
overflow: hidden;
text-overflow: ellipsis;
display: flex;
align-items: center;
}
.guideProgramTime {

View file

@ -257,10 +257,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
textlines.push(item.SeriesName || ' ');
}
// Not needed, part of mediainfo
//if (item.EpisodeTitle) {
// textlines.push(item.Name || ' ');
//}
if (item.EpisodeTitle) {
textlines.push(item.Name || ' ');
}
}
var displayName = itemHelper.getDisplayName(item);