From 3c571f5ded8c5ea1c37df910846e5aa424222abb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 5 Nov 2016 15:34:03 -0400 Subject: [PATCH] update latest items --- .../emby-webcomponents/.bower.json | 8 +-- .../emby-webcomponents/cardbuilder/card.css | 2 +- .../cardbuilder/cardbuilder.js | 11 +++- .../emby-button/emby-button.css | 2 +- .../emby-slider/emby-slider.css | 5 +- dashboard-ui/css/librarymenu.css | 8 +-- dashboard-ui/scripts/librarymenu.js | 2 +- dashboard-ui/scripts/tvlatest.js | 51 +++++++------------ 8 files changed, 40 insertions(+), 49 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 88f8cbb9d9..2cbaa94db6 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.330", - "_release": "1.4.330", + "version": "1.4.331", + "_release": "1.4.331", "_resolution": { "type": "version", - "tag": "1.4.330", - "commit": "14b8b8dd7303142a641995e0cd31a0972786399f" + "tag": "1.4.331", + "commit": "922ebb6b3119283fbe0585ccc1b71b87f26bb8ee" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css index 8deef2052a..3b7b7a97f5 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -107,7 +107,7 @@ button { .btnCardOptions { position: absolute; - bottom: 0; + bottom: .25em; right: 0; margin: 0 !important; z-index: 1; diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 93f8d97a5e..d8e7d67551 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -689,7 +689,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo return 'defaultCardColor' + getDefaultColorIndex(str); } - function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin) { + function getCardTextLines(lines, cssClass, forceLines, isOuterFooter, cardLayout, addRightMargin, maxLines) { var html = ''; @@ -714,10 +714,17 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo html += text; html += ""; valid++; + + if (maxLines && valid >= maxLines) { + break; + } } } if (forceLines) { + + length = Math.min(lines.length, maxLines || lines.length); + while (valid < length) { html += "
 
"; valid++; @@ -985,7 +992,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo lines = []; } - html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, isOuterFooter && options.cardLayout && !options.centerText); + html += getCardTextLines(lines, cssClass, !options.overlayText, isOuterFooter, options.cardLayout, isOuterFooter && options.cardLayout && !options.centerText, options.lines); if (progressHtml) { html += progressHtml; diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css index c4632a35f0..8f623792ef 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css @@ -152,7 +152,7 @@ .paper-icon-button-light > i { width: 1em; height: 1em; - font-size: 1.7em; + font-size: 1.6em; /* Make sure its on top of the ripple */ position: relative; z-index: 1; diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css b/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css index 5d7d936fd1..7eb966fdc1 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-slider/emby-slider.css @@ -24,6 +24,8 @@ _:-ms-input-placeholder, :root .mdl-slider { z-index: 1; cursor: pointer; margin: 0; + /* Disable webkit tap highlighting */ + -webkit-tap-highlight-color: rgba(0,0,0,0); /**************************** Tracks ****************************/ /**************************** Thumbs ****************************/ /**************************** 0-value ****************************/ @@ -224,6 +226,7 @@ _:-ms-input-placeholder, :root .mdl-slider { align-items: center; justify-content: center; } + .sliderBubbleText { margin: 0; -} \ No newline at end of file +} diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 9a12ec22f9..1b6edfc875 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -73,25 +73,20 @@ .libraryMenuButtonText { text-decoration: none; - font-weight: 400 !important; display: inline-flex; vertical-align: middle; padding-left: 0 !important; cursor: default; - position: relative; - top: 1px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; align-items: center; - margin-left: .75em; - font-size: 108%; + margin: 0 0 0 .5em; /* Avoid pushing right header off the screen */ flex-shrink: 1; } .viewMenuBar { - font-weight: bold; position: fixed; right: 0; left: 0; @@ -101,7 +96,6 @@ height: 50px; display: flex; flex-direction: column; - font-size: 13px; } .hiddenViewMenuBar .viewMenuBar { diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index d947a18617..edbb66aa02 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -22,7 +22,7 @@ html += ''; html += ''; - html += '
' + Globalize.translate('ButtonHome') + '
'; + html += '

' + Globalize.translate('ButtonHome') + '

'; html += '
'; diff --git a/dashboard-ui/scripts/tvlatest.js b/dashboard-ui/scripts/tvlatest.js index 62d2fe7fea..ff24b7be98 100644 --- a/dashboard-ui/scripts/tvlatest.js +++ b/dashboard-ui/scripts/tvlatest.js @@ -1,4 +1,4 @@ -define(['components/categorysyncbuttons', 'components/groupedcards', 'cardBuilder'], function (categorysyncbuttons, groupedcards, cardBuilder) { +define(['components/categorysyncbuttons', 'components/groupedcards', 'cardBuilder', 'apphost'], function (categorysyncbuttons, groupedcards, cardBuilder, appHost) { 'use strict'; function getView() { @@ -31,40 +31,27 @@ promise.then(function (items) { - var view = getView(); var html = ''; - if (view == 'ThumbCard') { + var supportsImageAnalysis = appHost.supports('imageanalysis'); - html += cardBuilder.getCardsHtml({ - items: items, - shape: "backdrop", - preferThumb: true, - inheritThumb: false, - showUnplayedIndicator: false, - showChildCountIndicator: true, - showParentTitle: true, - lazy: true, - showTitle: true, - cardLayout: true - }); - - } else if (view == 'Thumb') { - - html += cardBuilder.getCardsHtml({ - items: items, - shape: "backdrop", - preferThumb: true, - inheritThumb: false, - showParentTitle: false, - showUnplayedIndicator: false, - showChildCountIndicator: true, - centerText: true, - lazy: true, - showTitle: false, - overlayPlayButton: true - }); - } + html += cardBuilder.getCardsHtml({ + items: items, + shape: "backdrop", + preferThumb: true, + showTitle: true, + showSeriesYear: true, + showParentTitle: true, + overlayText: false, + cardLayout: true, + showUnplayedIndicator: false, + showChildCountIndicator: true, + centerText: false, + lazy: true, + overlayPlayButton: true, + vibrant: supportsImageAnalysis, + lines: 2 + }); var elem = context.querySelector('#latestEpisodes'); elem.innerHTML = html;