diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index c7c8a07162..d18a7ddae3 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -28,6 +28,7 @@ - [lewazo](https://github.com/lewazo) - [Raghu Saxena](https://github.com/ckcr4lyf) - [Nickbert7](https://github.com/Nickbert7) + - [ferferga](https://github.com/ferferga) # Emby Contributors diff --git a/src/components/activitylog.js b/src/components/activitylog.js index a6206477e7..2556680a6a 100644 --- a/src/components/activitylog.js +++ b/src/components/activitylog.js @@ -13,8 +13,7 @@ define(["events", "globalize", "dom", "datetime", "userSettings", "serverNotific if (entry.UserId && entry.UserPrimaryImageTag) { html += 'dvr" } else { html += '' + icon + ''; diff --git a/src/components/backdrop/backdrop.js b/src/components/backdrop/backdrop.js index c648e8491d..61f458dd87 100644 --- a/src/components/backdrop/backdrop.js +++ b/src/components/backdrop/backdrop.js @@ -173,19 +173,6 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./style'] currentLoadingBackdrop = instance; } - var standardWidths = [480, 720, 1280, 1440, 1920]; - function getBackdropMaxWidth() { - var width = dom.getWindowSize().innerWidth; - var roundScreenTo = 100; - - if (standardWidths.indexOf(width) !== -1) { - return width; - } - - width = Math.floor(width / roundScreenTo) * roundScreenTo; - return Math.min(width, 1920); - } - function getItemImageUrls(item, imageOptions) { imageOptions = imageOptions || {}; @@ -195,7 +182,6 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./style'] return apiClient.getScaledImageUrl(item.BackdropItemId || item.Id, Object.assign(imageOptions, { type: "Backdrop", tag: imgTag, - maxWidth: getBackdropMaxWidth(), index: index })); }); @@ -206,7 +192,6 @@ define(['browser', 'connectionManager', 'playbackManager', 'dom', 'css!./style'] return apiClient.getScaledImageUrl(item.ParentBackdropItemId, Object.assign(imageOptions, { type: "Backdrop", tag: imgTag, - maxWidth: getBackdropMaxWidth(), index: index })); }); diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css index 9a74085917..942e05c77a 100644 --- a/src/components/cardbuilder/card.css +++ b/src/components/cardbuilder/card.css @@ -232,9 +232,10 @@ button { left: 0; right: 0; bottom: 0; - background-size: contain; + background-size: cover; background-repeat: no-repeat; - background-position: center bottom; + background-position: center; + border: none; } .cardImage-img { diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js index 0344300d39..d91802dc71 100644 --- a/src/components/cardbuilder/cardBuilder.js +++ b/src/components/cardbuilder/cardBuilder.js @@ -471,7 +471,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Thumb", - maxWidth: width, tag: item.ImageTags.Thumb }); @@ -479,7 +478,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Banner", - maxWidth: width, tag: item.ImageTags.Banner }); @@ -487,7 +485,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Disc", - maxWidth: width, tag: item.ImageTags.Disc }); @@ -495,7 +492,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Logo", - maxWidth: width, tag: item.ImageTags.Logo }); @@ -503,7 +499,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.ParentLogoItemId, { type: "Logo", - maxWidth: width, tag: item.ParentLogoImageTag }); @@ -511,7 +506,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.SeriesId, { type: "Thumb", - maxWidth: width, tag: item.SeriesThumbImageTag }); @@ -519,7 +513,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, { type: "Thumb", - maxWidth: width, tag: item.ParentThumbImageTag }); @@ -527,7 +520,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Backdrop", - maxWidth: width, tag: item.BackdropImageTags[0] }); @@ -537,7 +529,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, { type: "Backdrop", - maxWidth: width, tag: item.ParentBackdropImageTags[0] }); @@ -547,8 +538,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Primary", - maxHeight: height, - maxWidth: width, tag: item.ImageTags.Primary }); @@ -569,8 +558,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.PrimaryImageItemId || item.Id || item.ItemId, { type: "Primary", - maxHeight: height, - maxWidth: width, tag: item.PrimaryImageTag }); @@ -589,7 +576,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, { type: "Primary", - maxWidth: width, tag: item.ParentPrimaryImageTag }); } @@ -597,7 +583,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.SeriesId, { type: "Primary", - maxWidth: width, tag: item.SeriesPrimaryImageTag }); } @@ -607,8 +592,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.AlbumId, { type: "Primary", - maxHeight: height, - maxWidth: width, tag: item.AlbumPrimaryImageTag }); @@ -623,7 +606,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Thumb", - maxWidth: width, tag: item.ImageTags.Thumb }); @@ -632,7 +614,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Backdrop", - maxWidth: width, tag: item.BackdropImageTags[0] }); @@ -640,7 +621,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.Id, { type: "Thumb", - maxWidth: width, tag: item.ImageTags.Thumb }); @@ -648,7 +628,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.SeriesId, { type: "Thumb", - maxWidth: width, tag: item.SeriesThumbImageTag }); @@ -656,7 +635,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.ParentThumbItemId, { type: "Thumb", - maxWidth: width, tag: item.ParentThumbImageTag }); @@ -664,7 +642,6 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, { type: "Backdrop", - maxWidth: width, tag: item.ParentBackdropImageTags[0] }); diff --git a/src/components/emby-button/emby-button.css b/src/components/emby-button/emby-button.css index f6da6b040f..0273de9d7d 100644 --- a/src/components/emby-button/emby-button.css +++ b/src/components/emby-button/emby-button.css @@ -147,15 +147,14 @@ vertical-align: middle; } - .paper-icon-button-light > img { - width: 1.72em; - /* Can't use 100% height or it will stretch past the boundaries in safari */ - /*height: 100%;*/ + .paper-icon-button-light > div { max-height: 100%; - /* Make sure its on top of the ripple */ + transform: scale(1.8); position: relative; z-index: 1; vertical-align: middle; + display: inline; + margin: 0 auto; } .emby-button-foreground { diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js index 24b3cda5c1..229befdeda 100644 --- a/src/controllers/dashboardpage.js +++ b/src/controllers/dashboardpage.js @@ -304,7 +304,7 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa html += ""; html += '