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

continue card unification

Browse source
This commit is contained in:
Luke Pulverenti 2016-07-30 00:53:19 -04:00
parent d0100ecb29
commit ebe4dc0ca5
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@
} }
.verticalItemsContainer .card { .verticalItemsContainer .card {
contain: layout style; contain: strict;
} }
.card, .card:focus { .card, .card:focus {
@ -280,10 +280,6 @@ button.cardContent {
transition: background-color .5s ease-out; transition: background-color .5s ease-out;
} }
.emptyCardImageContainer {
font-size: 90%;
}
.defaultCardColor1 { .defaultCardColor1 {
background-color: #009688; background-color: #009688;
} }

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

@ -977,7 +977,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
} }
if (!imgUrl) { if (!imgUrl) {
cardImageContainerClass += ' emptyCardImageContainer defaultCardColor' + getRandomInt(1, 5); cardImageContainerClass += ' defaultCardColor' + getRandomInt(1, 5);
} }
var separateCardBox = scalable; var separateCardBox = scalable;

12
dashboard-ui/scripts/musicrecommended.js
View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'scrollStyles', 'emby-itemscontainer'], function (libraryBrowser) { define(['libraryBrowser', 'cardBuilder', 'scrollStyles', 'emby-itemscontainer'], function (libraryBrowser, cardBuilder) {
function itemsPerRow() { function itemsPerRow() {
@ -34,7 +34,7 @@
ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) { ApiClient.getJSON(ApiClient.getUrl('Users/' + userId + '/Items/Latest', options)).then(function (items) {
var elem = page.querySelector('#recentlyAddedSongs'); var elem = page.querySelector('#recentlyAddedSongs');
elem.innerHTML = libraryBrowser.getPosterViewHtml({ elem.innerHTML = cardBuilder.getCardsHtml({
items: items, items: items,
showUnplayedIndicator: false, showUnplayedIndicator: false,
showLatestItemsPopup: false, showLatestItemsPopup: false,
@ -80,7 +80,7 @@
} }
var itemsContainer = elem.querySelector('.itemsContainer'); var itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.innerHTML = libraryBrowser.getPosterViewHtml({ itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
showUnplayedIndicator: false, showUnplayedIndicator: false,
shape: getSquareShape(), shape: getSquareShape(),
@ -126,7 +126,7 @@
} }
var itemsContainer = elem.querySelector('.itemsContainer'); var itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.innerHTML = libraryBrowser.getPosterViewHtml({ itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
showUnplayedIndicator: false, showUnplayedIndicator: false,
shape: getSquareShape(), shape: getSquareShape(),
@ -169,7 +169,7 @@
} }
var itemsContainer = elem.querySelector('.itemsContainer'); var itemsContainer = elem.querySelector('.itemsContainer');
itemsContainer.innerHTML = libraryBrowser.getPosterViewHtml({ itemsContainer.innerHTML = cardBuilder.getCardsHtml({
items: result.Items, items: result.Items,
shape: getSquareShape(), shape: getSquareShape(),
showTitle: true, showTitle: true,
@ -255,8 +255,10 @@
for (var i = 0, length = containers.length; i < length; i++) { for (var i = 0, length = containers.length; i < length; i++) {
if (enableScrollX()) { if (enableScrollX()) {
containers[i].classList.add('hiddenScrollX'); containers[i].classList.add('hiddenScrollX');
containers[i].classList.remove('verticalItemsContainer');
} else { } else {
containers[i].classList.remove('hiddenScrollX'); containers[i].classList.remove('hiddenScrollX');
containers[i].classList.add('verticalItemsContainer');
} }
} }
}; };

4
dashboard-ui/scripts/searchpage.js
View file

@ -1,4 +1,4 @@
define(['libraryBrowser', 'focusManager', 'embyRouter', 'emby-input', 'paper-icon-button-light', 'material-icons', 'emby-itemscontainer'], function (libraryBrowser, focusManager, embyRouter) { define(['libraryBrowser', 'focusManager', 'embyRouter', 'cardBuilder', 'emby-input', 'paper-icon-button-light', 'material-icons', 'emby-itemscontainer'], function (libraryBrowser, focusManager, embyRouter, cardBuilder) {
function loadSuggestions(page) { function loadSuggestions(page) {
@ -112,7 +112,7 @@
return i; return i;
}); });
var html = libraryBrowser.getPosterViewHtml({ var html = cardBuilder.getCardsHtml({
items: hints, items: hints,
shape: "auto", shape: "auto",
lazy: true, lazy: true,