From cee7db2ce049ddcd8d140c9c0551dc8d8c5f40b5 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 11 Aug 2016 16:28:49 -0400 Subject: [PATCH] update card layouts --- .../emby-webcomponents/.bower.json | 8 +- .../emby-webcomponents/cardbuilder/card.css | 8 +- .../cardbuilder/cardbuilder.js | 2 +- .../cardbuilder/chaptercardbuilder.js | 12 +- .../cardbuilder/peoplecardbuilder.js | 2 +- .../emby-webcomponents/dialog/dialog.js | 5 +- .../emby-webcomponents/itemcontextmenu.js | 16 +-- .../itemidentifier/itemidentifier.js | 2 +- .../notifications/notifications.js | 31 +++-- .../iron-demo-helpers/.bower.json | 10 +- .../iron-demo-helpers/bower.json | 4 +- .../iron-demo-helpers/demo-snippet.html | 2 + .../bower_components/iron-icon/.bower.json | 14 +-- .../bower_components/iron-icon/bower.json | 2 +- .../bower_components/iron-icon/iron-icon.html | 2 + .../bower_components/polymer/.bower.json | 6 +- .../components/navdrawer/navdrawer.js | 2 + dashboard-ui/css/dashboard.css | 4 - dashboard-ui/scripts/dashboardpage.js | 2 +- dashboard-ui/scripts/itemdetailpage.js | 2 +- dashboard-ui/scripts/loginpage.js | 2 +- dashboard-ui/scripts/medialibrarypage.js | 2 +- dashboard-ui/scripts/mediaplayer-video.js | 2 +- dashboard-ui/scripts/plugincatalogpage.js | 2 +- dashboard-ui/scripts/pluginspage.js | 2 +- dashboard-ui/scripts/sections.js | 2 +- dashboard-ui/scripts/syncactivity.js | 2 +- dashboard-ui/scripts/userprofilespage.js | 4 +- dashboard-ui/serviceworker.js | 111 ++++++++++++++++++ 29 files changed, 194 insertions(+), 71 deletions(-) diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index fce1be0321..341c82e685 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.165", - "_release": "1.4.165", + "version": "1.4.166", + "_release": "1.4.166", "_resolution": { "type": "version", - "tag": "1.4.165", - "commit": "ebe71bd8b4505ceb207efb226686eb6c3e842b4c" + "tag": "1.4.166", + "commit": "869fe388b2e0bd01bee868001f9e1d456a2c7ca1" }, "_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 cc5b82ef31..72a48d6b58 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/card.css @@ -48,19 +48,19 @@ position: relative; } -.backdropCard .cardPadder, .smallBackdropCard .cardPadder, .overflowBackdropCard .cardPadder { +.cardPadder-backdrop, .cardPadder-smallBackdrop, .cardPadder-overflowBackdrop { padding-bottom: 56.25%; } -.squareCard .cardPadder, .overflowSquareCard .cardPadder { +.cardPadder-square, .cardPadder-overflowSquare { padding-bottom: 100%; } -.portraitCard .cardPadder, .overflowPortraitCard .cardPadder { +.cardPadder-portrait, .cardPadder-overflowPortrait { padding-bottom: 150%; } -.bannerCard .cardPadder { +.cardPadder-banner { padding-bottom: 18.5%; } diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js index 09e94e7324..c515146f49 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js @@ -1073,7 +1073,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo cardContentClose = ''; } cardImageContainerOpen = imgUrl ? ('
') : ('
'); - cardImageContainerOpen = '
' + cardContentOpen + cardImageContainerOpen; + cardImageContainerOpen = '
' + cardContentOpen + cardImageContainerOpen; cardBoxClose = '
'; cardScalableClose = '
'; cardImageContainerClose = '
'; diff --git a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js index 0901e59fe0..34d90561e1 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js +++ b/dashboard-ui/bower_components/emby-webcomponents/cardbuilder/chaptercardbuilder.js @@ -9,16 +9,16 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemShortcuts'], functi return i.Type == 'Video'; })[0] || {}; - var shape = (options.backdropShape || 'backdrop') + 'Card'; + var shape = (options.backdropShape || 'backdrop'); if (videoStream.Width && videoStream.Height) { if ((videoStream.Width / videoStream.Height) <= 1.34) { - shape = (options.squareShape || 'square') + 'Card'; + shape = (options.squareShape || 'square'); } } - className += ' ' + shape; + className += ' ' + shape + 'Card'; if (options.block || options.rows) { className += ' block'; @@ -37,7 +37,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemShortcuts'], functi var chapter = chapters[i]; - html += buildChapterCard(item, apiClient, chapter, i, options, className); + html += buildChapterCard(item, apiClient, chapter, i, options, className, shape); itemsInRow++; if (options.rows && itemsInRow >= options.rows) { @@ -65,7 +65,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemShortcuts'], functi return null; } - function buildChapterCard(item, apiClient, chapter, index, options, className) { + function buildChapterCard(item, apiClient, chapter, index, options, className, shape) { var imgUrl = getImgUrl(item, chapter, index, options.width || 400, apiClient); @@ -88,7 +88,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemShortcuts'], functi