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

update components

This commit is contained in:
Luke Pulverenti 2016-08-08 14:13:52 -04:00
parent f9240e5fb5
commit b1feee2d1c
17 changed files with 39 additions and 54 deletions

View file

@ -172,6 +172,7 @@ button.card {
position: relative;
background-clip: content-box !important;
border-radius: 2px;
color: #fff;
}
.visualCardBox .cardImageContainer {
@ -259,6 +260,7 @@ button.cardImageContainer {
z-index: 1;
overflow: hidden;
max-width: 100%;
color: #fff;
}
.innerCardFooterClear {
@ -274,16 +276,9 @@ button.cardImageContainer {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.cardText {
color: inherit;
}
.innerCardFooter .cardText, .cardImageContainer .cardText {
color: #fff;
}
.cardTextCentered {
text-align: center;
}
@ -310,7 +305,7 @@ button.cardImageContainer {
color: #fff;
}
.card .indicators {
.cardIndicators {
right: 2.5%;
top: 2.5%;
position: absolute;
@ -318,12 +313,12 @@ button.cardImageContainer {
align-items: center;
}
.portraitCard .indicators {
.portraitCardIndicators {
right: 3%;
top: 2%;
}
.backdropCard .indicators {
.backdropCardIndicators {
right: 1.5%;
top: 2.8%;
}

View file

@ -1102,7 +1102,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
}
if (indicatorsHtml) {
cardImageContainerOpen += '<div class="indicators">' + indicatorsHtml + '</div>';
cardImageContainerOpen += '<div class="cardIndicators ' + options.shape + 'CardIndicators">' + indicatorsHtml + '</div>';
}
var forceName = imgInfo.forceName;

View file

@ -12,12 +12,15 @@
text-align: left;
padding: .25em 1.15em;
line-height: 160%;
border-bottom: 1px solid #2a2a2a;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
}
.listItem-border {
border-bottom: 1px solid #2a2a2a;
}
.listItem-button {
width: 100%;
}
@ -131,11 +134,11 @@
color: inherit !important;
}
.layout-tv .listItem {
.listItem-focusscale {
transition: transform .2s ease-out;
}
.layout-tv .listItem:focus {
.listItem-focusscale:focus {
transform: scale(1.025, 1.025);
}
@ -150,11 +153,7 @@
background-color: transparent !important;
}
.paperList .listItem {
border-bottom: 0;
}
.layout-tv .listItemMediaInfo {
.listItemMediaInfo-padded {
margin: .5em 0;
}

View file

@ -178,12 +178,16 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
}
}
var cssClass = "listItem listItem-nosidepadding";
var cssClass = "listItem listItem-nosidepadding listItem-border";
if (clickEntireItem) {
cssClass += ' itemAction listItem-button';
}
if (layoutManager.tv) {
cssClass += ' listItem-focusscale';
}
var downloadWidth = 80;
if (isLargeStyle) {
@ -281,7 +285,13 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += getTextLinesHtml(textlines, isLargeStyle);
if (!enableSideMediaInfo) {
html += '<div class="secondary listItemMediaInfo listItemBodyText">' + mediaInfo.getPrimaryMediaInfoHtml(item) + '</div>';
var mediaInfoClass = 'secondary listItemMediaInfo listItemBodyText';
if (layoutManager.tv) {
mediaInfoClass += ' listItemMediaInfo-padded';
}
html += '<div class="' + mediaInfoClass + '">' + mediaInfo.getPrimaryMediaInfoHtml(item) + '</div>';
}
if (enableOverview && item.Overview) {

View file

@ -117,7 +117,9 @@
var itemHtml = '';
var tagName = layoutManager.tv ? 'button' : 'div';
var className = layoutManager.tv && s.Path ? 'listItem btnDelete' : 'listItem';
var className = layoutManager.tv && s.Path ? 'listItem listItem-focusscale btnDelete' : 'listItem';
className += ' listItem-noborder';
itemHtml += '<' + tagName + ' class="' + className + '" data-index="' + s.Index + '">';