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

sync version

This commit is contained in:
Luke Pulverenti 2015-11-24 01:23:06 -05:00
parent a354e26a71
commit 9f3a4710e3
2 changed files with 23 additions and 18 deletions

View file

@ -305,28 +305,28 @@
html += '<div class="channelHeaderCellContainer">'; html += '<div class="channelHeaderCellContainer">';
html += '<div class="channelHeaderCell">'; html += '<a class="channelHeaderCell" href="itemdetails.html?id=' + channel.Id + '">';
html += '<a class="channelHeaderCellInner" href="itemdetails.html?id=' + channel.Id + '">';
var hasChannelImage = channel.ImageTags.Primary; var hasChannelImage = channel.ImageTags.Primary;
var cssClass = hasChannelImage ? 'guideChannelInfo guideChannelInfoWithImage' : 'guideChannelInfo'; var cssClass = hasChannelImage ? 'guideChannelInfo guideChannelInfoWithImage' : 'guideChannelInfo';
html += '<div class="' + cssClass + '">' + channel.Name + '<br/>' + channel.Number + '</div>'; html += '<div class="' + cssClass + '">' + channel.Number + '</div>';
if (hasChannelImage) { if (hasChannelImage) {
var url = ApiClient.getScaledImageUrl(channel.Id, { var url = ApiClient.getScaledImageUrl(channel.Id, {
maxHeight: 40, maxHeight: 44,
maxWidth: 60, maxWidth: 70,
tag: channel.ImageTags.Primary, tag: channel.ImageTags.Primary,
type: "Primary" type: "Primary"
}); });
html += '<div class="guideChannelImage lazy" data-src="' + url + '"></div>'; html += '<div class="guideChannelImage lazy" data-src="' + url + '"></div>';
} else {
html += '<div class="guideChannelName">' + channel.Name + '</div>';
} }
html += '</a>'; html += '</a>';
html += '</div>';
html += '</div>'; html += '</div>';
} }

View file

@ -232,13 +232,15 @@
height: 42px; height: 42px;
} }
.channelHeaderCellInner { .channelHeaderCell {
padding: .35em .5em .5em; padding: 0;
display: block;
text-decoration: none; text-decoration: none;
font-weight: 400 !important; font-weight: 400 !important;
color: #fff !important; color: #fff !important;
position: relative; position: relative;
display: flex;
align-items: center;
justify-content: center;
} }
.pointerInput .channelHeaderCell:hover { .pointerInput .channelHeaderCell:hover {
@ -307,17 +309,24 @@
max-width: 110px; max-width: 110px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
margin-left: .5em;
margin-right: auto;
} }
.guideChannelImage { .guideChannelImage {
width: 60px; width: 70px;
height: 40px; height: 44px;
position: absolute;
right: 7px;
top: 7px;
background-size: contain; background-size: contain;
background-position: right center; background-position: right center;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-right: .5em;
}
.guideChannelName {
margin-right: .5em;
max-width: 50%;
overflow: hidden;
text-overflow: ellipsis;
} }
@media (max-width: 1920px) { @media (max-width: 1920px) {
@ -369,10 +378,6 @@
padding-top: .8em; padding-top: .8em;
} }
.channelHeaderCellInner {
padding-top: .6em;
}
.channelTimeslotHeader a { .channelTimeslotHeader a {
padding-left: 0 !important; padding-left: 0 !important;
} }