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

Merge pull request #325 from dkanada/string

Browse source 
Add some missing strings and remove gradients from themes
This commit is contained in:
Anthony Lavado 2019-05-23 20:06:00 -04:00 • committed by GitHub
commit da16b3eaf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 24 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/components/playback/playersettingsmenu.js
View file

@ -136,8 +136,7 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
} }
function showAspectRatioMenu(player, btn) { function showAspectRatioMenu(player, btn) {
// each has a name and id
// Each has name/id
var currentId = playbackManager.getAspectRatio(player); var currentId = playbackManager.getAspectRatio(player);
var menuItems = playbackManager.getSupportedAspectRatios(player).map(function (i) { var menuItems = playbackManager.getSupportedAspectRatios(player).map(function (i) {
return { return {
@ -148,12 +147,9 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
}); });
return actionsheet.show({ return actionsheet.show({
items: menuItems, items: menuItems,
positionTo: btn positionTo: btn
}).then(function (id) { }).then(function (id) {
if (id) { if (id) {
playbackManager.setAspectRatio(id, player); playbackManager.setAspectRatio(id, player);
return Promise.resolve(); return Promise.resolve();
@ -164,15 +160,11 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
} }
function showWithUser(options, player, user) { function showWithUser(options, player, user) {
var supportedCommands = playbackManager.getSupportedCommands(player); var supportedCommands = playbackManager.getSupportedCommands(player);
var mediaType = options.mediaType; var mediaType = options.mediaType;
var menuItems = []; var menuItems = [];
if (supportedCommands.indexOf('SetAspectRatio') !== -1) { if (supportedCommands.indexOf('SetAspectRatio') !== -1) {
var currentAspectRatioId = playbackManager.getAspectRatio(player); var currentAspectRatioId = playbackManager.getAspectRatio(player);
var currentAspectRatio = playbackManager.getSupportedAspectRatios(player).filter(function (i) { var currentAspectRatio = playbackManager.getSupportedAspectRatios(player).filter(function (i) {
return i.id === currentAspectRatioId; return i.id === currentAspectRatioId;
@ -205,19 +197,18 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
}); });
} }
if (options.stats) { if (options.suboffset) {
menuItems.push({ menuItems.push({
name: globalize.translate('PlaybackData'), name: globalize.translate('SubtitleOffset'),
id: 'stats', id: 'suboffset',
asideText: null asideText: null
}); });
} }
if (options.suboffset) { if (options.stats) {
menuItems.push({ menuItems.push({
name: globalize.translate('SubtitleOffset'), name: globalize.translate('PlaybackData'),
id: 'suboffset', id: 'stats',
asideText: null asideText: null
}); });
} }
@ -272,4 +263,4 @@ define(['connectionManager', 'actionsheet', 'datetime', 'playbackManager', 'glob
return { return {
show: show show: show
}; };
}); });

8
src/components/themes/dark/theme.css
View file

@ -19,14 +19,10 @@ html {
background-color: #101010 background-color: #101010
} }
.skinHeader.semiTransparent { .skinHeader .semiTransparent {
-webkit-backdrop-filter: none !important; -webkit-backdrop-filter: none !important;
backdrop-filter: none !important; backdrop-filter: none !important;
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, 0.7);
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))
} }
.pageTitleWithDefaultLogo { .pageTitleWithDefaultLogo {

8
src/components/themes/emby/theme.css
View file

@ -19,14 +19,10 @@ html {
background-color: #1f1f1f background-color: #1f1f1f
} }
.skinHeader.semiTransparent { .skinHeader .semiTransparent {
-webkit-backdrop-filter: none !important; -webkit-backdrop-filter: none !important;
backdrop-filter: none !important; backdrop-filter: none !important;
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, 0.7);
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))
} }
.pageTitleWithDefaultLogo { .pageTitleWithDefaultLogo {

8
src/components/themes/light/theme.css
View file

@ -32,14 +32,10 @@ html {
box-shadow: none !important box-shadow: none !important
} }
.skinHeader.semiTransparent { .skinHeader .semiTransparent {
-webkit-backdrop-filter: none !important; -webkit-backdrop-filter: none !important;
backdrop-filter: none !important; backdrop-filter: none !important;
background-color: rgba(0, 0, 0, .3); background-color: rgba(0, 0, 0, 0.7);
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))
} }
.pageTitleWithDefaultLogo { .pageTitleWithDefaultLogo {

3
src/components/upnextdialog/upnextdialog.css
View file

@ -8,8 +8,7 @@
flex-direction: column; flex-direction: column;
will-change: transform, opacity; will-change: transform, opacity;
transition: opacity 300ms ease-out; transition: opacity 300ms ease-out;
background-color: rgba(0, 0, 0, .7); background-color: rgba(0, 0, 0, 0.7);
background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .9));
color: #fff; color: #fff;
user-select: none; user-select: none;
-webkit-touch-callout: none; -webkit-touch-callout: none;

18
src/css/videoosd.css
View file

@ -20,11 +20,7 @@
transition: opacity .3s ease-out; transition: opacity .3s ease-out;
position: relative; position: relative;
z-index: 1; z-index: 1;
background-color: rgba(0, 0, 0, .3) !important; background-color: rgba(0, 0, 0, 0.7) !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;
-webkit-backdrop-filter: none !important; -webkit-backdrop-filter: none !important;
backdrop-filter: none !important; backdrop-filter: none !important;
color: #eee color: #eee
@ -93,7 +89,7 @@
.videoOsdBottom { .videoOsdBottom {
position: fixed; position: fixed;
background-color: rgba(0, 0, 0, .7); background-color: rgba(0, 0, 0, 0.7);
padding: 1%; padding: 1%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
@ -103,13 +99,9 @@
-webkit-flex-direction: row; -webkit-flex-direction: row;
flex-direction: row; flex-direction: row;
will-change: opacity; will-change: opacity;
-webkit-transition: opacity .3s ease-out; -webkit-transition: opacity 0.3s ease-out;
-o-transition: opacity .3s ease-out; -o-transition: opacity 0.3s ease-out;
transition: opacity .3s ease-out; transition: opacity 0.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));
color: #fff; color: #fff;
user-select: none; user-select: none;
-webkit-touch-callout: none -webkit-touch-callout: none

4
src/strings/en-us.json
View file

@ -997,6 +997,9 @@
"MoveRight": "Move right", "MoveRight": "Move right",
"MovieLibraryHelp": "Review the {0}Jellyfin movie naming guide{1}.", "MovieLibraryHelp": "Review the {0}Jellyfin movie naming guide{1}.",
"Movies": "Movies", "Movies": "Movies",
"MusicAlbum": "Music Album",
"MusicArtist": "Music Artist",
"MusicVideo": "Music Video",
"Mute": "Mute", "Mute": "Mute",
"MySubtitles": "My Subtitles", "MySubtitles": "My Subtitles",
"Name": "Name", "Name": "Name",
@ -1310,6 +1313,7 @@
"SubtitleAppearanceSettingsAlsoPassedToCastDevices": "These settings also apply to any Chromecast playback started by this device.", "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).", "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.", "SubtitleDownloadersHelp": "Enable and rank your preferred subtitle downloaders in order of priority.",
"SubtitleOffset": "Subtitle Offset",
"Subtitles": "Subtitles", "Subtitles": "Subtitles",
"Suggestions": "Suggestions", "Suggestions": "Suggestions",
"Sunday": "Sunday", "Sunday": "Sunday",