mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge pull request #325 from dkanada/string
Add some missing strings and remove gradients from themes
This commit is contained in:
commit
da16b3eaf0
7 changed files with 24 additions and 50 deletions
|
@ -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
|
||||
};
|
||||
});
|
||||
});
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue