From 3c8361d87cb0f64f4046280b1bec430fe7f50e52 Mon Sep 17 00:00:00 2001 From: dkanada Date: Thu, 16 May 2019 14:33:57 -0700 Subject: [PATCH 1/3] add missing string and reorder playback menu --- src/components/playback/playersettingsmenu.js | 25 ++++++------------- src/strings/en-us.json | 1 + 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/src/components/playback/playersettingsmenu.js b/src/components/playback/playersettingsmenu.js index 9d5b1f08ba..086f98c2d4 100644 --- a/src/components/playback/playersettingsmenu.js +++ b/src/components/playback/playersettingsmenu.js @@ -136,8 +136,7 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob } function showAspectRatioMenu(player, btn) { - - // Each has name/id + // each has a name and id var currentId = playbackManager.getAspectRatio(player); var menuItems = playbackManager.getSupportedAspectRatios(player).map(function (i) { return { @@ -148,12 +147,9 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob }); return actionsheet.show({ - items: menuItems, positionTo: btn - }).then(function (id) { - if (id) { playbackManager.setAspectRatio(id, player); return Promise.resolve(); @@ -164,15 +160,11 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob } function showWithUser(options, player, user) { - var supportedCommands = playbackManager.getSupportedCommands(player); - var mediaType = options.mediaType; var menuItems = []; - if (supportedCommands.indexOf('SetAspectRatio') !== -1) { - var currentAspectRatioId = playbackManager.getAspectRatio(player); var currentAspectRatio = playbackManager.getSupportedAspectRatios(player).filter(function (i) { return i.id === currentAspectRatioId; @@ -205,19 +197,18 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob }); } - if (options.stats) { + if (options.suboffset) { menuItems.push({ - name: globalize.translate('PlaybackData'), - id: 'stats', + name: globalize.translate('SubtitleOffset'), + id: 'suboffset', asideText: null }); } - if (options.suboffset) { - + if (options.stats) { menuItems.push({ - name: globalize.translate('SubtitleOffset'), - id: 'suboffset', + name: globalize.translate('PlaybackData'), + id: 'stats', asideText: null }); } @@ -272,4 +263,4 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob return { show: show }; -}); \ No newline at end of file +}); diff --git a/src/strings/en-us.json b/src/strings/en-us.json index cb8b735624..a3b5d427ff 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -1310,6 +1310,7 @@ "SubtitleAppearanceSettingsAlsoPassedToCastDevices": "These settings also apply to any Chromecast playback started by this device.", "SubtitleAppearanceSettingsDisclaimer": "These settings will not apply to graphical subtitles (PGS, DVD, etc), or subtitles that have their own styles embedded (ASS/SSA).", "SubtitleDownloadersHelp": "Enable and rank your preferred subtitle downloaders in order of priority.", + "SubtitleOffset": "Subtitle Offset", "Subtitles": "Subtitles", "Suggestions": "Suggestions", "Sunday": "Sunday", From 8f30b70bfbb3240ff8a21ddd4f75e72bd290f4aa Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 20 May 2019 00:02:24 -0700 Subject: [PATCH 2/3] add back three strings in the library edit page --- src/strings/en-us.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/strings/en-us.json b/src/strings/en-us.json index a3b5d427ff..aad3ee96d1 100644 --- a/src/strings/en-us.json +++ b/src/strings/en-us.json @@ -997,6 +997,9 @@ "MoveRight": "Move right", "MovieLibraryHelp": "Review the {0}Jellyfin movie naming guide{1}.", "Movies": "Movies", + "MusicAlbum": "Music Album", + "MusicArtist": "Music Artist", + "MusicVideo": "Music Video", "Mute": "Mute", "MySubtitles": "My Subtitles", "Name": "Name", From 0f67caab69785872c9c6b0dcef41d2e5e74aa22f Mon Sep 17 00:00:00 2001 From: dkanada Date: Mon, 20 May 2019 00:27:09 -0700 Subject: [PATCH 3/3] remove gradient from the osd elements --- src/components/themes/dark/theme.css | 8 ++------ src/components/themes/emby/theme.css | 8 ++------ src/components/themes/light/theme.css | 8 ++------ src/components/upnextdialog/upnextdialog.css | 3 +-- src/css/videoosd.css | 18 +++++------------- 5 files changed, 12 insertions(+), 33 deletions(-) diff --git a/src/components/themes/dark/theme.css b/src/components/themes/dark/theme.css index 8f89ebef5d..13f73dff7c 100644 --- a/src/components/themes/dark/theme.css +++ b/src/components/themes/dark/theme.css @@ -19,14 +19,10 @@ html { background-color: #101010 } -.skinHeader.semiTransparent { +.skinHeader .semiTransparent { -webkit-backdrop-filter: none !important; backdrop-filter: none !important; - background-color: rgba(0, 0, 0, .3); - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))); - background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); - background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); - background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) + background-color: rgba(0, 0, 0, 0.7); } .pageTitleWithDefaultLogo { diff --git a/src/components/themes/emby/theme.css b/src/components/themes/emby/theme.css index 3e5809c191..f4d1627425 100644 --- a/src/components/themes/emby/theme.css +++ b/src/components/themes/emby/theme.css @@ -19,14 +19,10 @@ html { background-color: #1f1f1f } -.skinHeader.semiTransparent { +.skinHeader .semiTransparent { -webkit-backdrop-filter: none !important; backdrop-filter: none !important; - background-color: rgba(0, 0, 0, .3); - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))); - background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); - background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); - background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) + background-color: rgba(0, 0, 0, 0.7); } .pageTitleWithDefaultLogo { diff --git a/src/components/themes/light/theme.css b/src/components/themes/light/theme.css index ac8c0e040e..5d379db888 100644 --- a/src/components/themes/light/theme.css +++ b/src/components/themes/light/theme.css @@ -32,14 +32,10 @@ html { box-shadow: none !important } -.skinHeader.semiTransparent { +.skinHeader .semiTransparent { -webkit-backdrop-filter: none !important; backdrop-filter: none !important; - background-color: rgba(0, 0, 0, .3); - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))); - background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); - background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)); - background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) + background-color: rgba(0, 0, 0, 0.7); } .pageTitleWithDefaultLogo { diff --git a/src/components/upnextdialog/upnextdialog.css b/src/components/upnextdialog/upnextdialog.css index 548eca9804..336a90d58e 100644 --- a/src/components/upnextdialog/upnextdialog.css +++ b/src/components/upnextdialog/upnextdialog.css @@ -8,8 +8,7 @@ flex-direction: column; will-change: transform, opacity; transition: opacity 300ms ease-out; - background-color: rgba(0, 0, 0, .7); - background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .9)); + background-color: rgba(0, 0, 0, 0.7); color: #fff; user-select: none; -webkit-touch-callout: none; diff --git a/src/css/videoosd.css b/src/css/videoosd.css index bd24e41309..61ad459256 100644 --- a/src/css/videoosd.css +++ b/src/css/videoosd.css @@ -20,11 +20,7 @@ transition: opacity .3s ease-out; position: relative; z-index: 1; - background-color: rgba(0, 0, 0, .3) !important; - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .6)), to(rgba(0, 0, 0, 0))) !important; - background: -webkit-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) !important; - background: -o-linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) !important; - background: linear-gradient(rgba(0, 0, 0, .6), rgba(0, 0, 0, 0)) !important; + background-color: rgba(0, 0, 0, 0.7) !important; -webkit-backdrop-filter: none !important; backdrop-filter: none !important; color: #eee @@ -93,7 +89,7 @@ .videoOsdBottom { position: fixed; - background-color: rgba(0, 0, 0, .7); + background-color: rgba(0, 0, 0, 0.7); padding: 1%; display: -webkit-box; display: -webkit-flex; @@ -103,13 +99,9 @@ -webkit-flex-direction: row; flex-direction: row; will-change: opacity; - -webkit-transition: opacity .3s ease-out; - -o-transition: opacity .3s ease-out; - transition: opacity .3s ease-out; - background: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, .5)), to(rgba(0, 0, 0, .8))); - background: -webkit-linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .8)); - background: -o-linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .8)); - background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .8)); + -webkit-transition: opacity 0.3s ease-out; + -o-transition: opacity 0.3s ease-out; + transition: opacity 0.3s ease-out; color: #fff; user-select: none; -webkit-touch-callout: none