1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

reduce recording failures

This commit is contained in:
Luke Pulverenti 2016-09-15 02:23:39 -04:00
parent 274dbafef5
commit 8d12e05583
16 changed files with 60 additions and 48 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.244",
"_release": "1.4.244",
"version": "1.4.245",
"_release": "1.4.245",
"_resolution": {
"type": "version",
"tag": "1.4.244",
"commit": "5f86563c8bb109824f6acd8ffe725cbb58725589"
"tag": "1.4.245",
"commit": "cbd3d75f0ee42828276ecf512205a3087c63baba"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -4,7 +4,6 @@
align-items: center;
box-sizing: border-box;
margin: 0 .29em;
background: transparent;
text-align: center;
font-size: inherit;
font-family: inherit;
@ -32,6 +31,10 @@
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
.emby-button:not(.raised) {
background: transparent;
}
.emby-button.raised, .emby-button.fab {
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
}

View file

@ -58,22 +58,6 @@
color: #fff;
}
.newTvProgram {
background: #64A239;
}
.liveTvProgram {
background: #EC407A;
}
.premiereTvProgram {
background: #EF6C00;
}
.repeatTvProgram {
background: #009688;
}
.programAccent {
position: absolute;
bottom: 0;

View file

@ -1,4 +1,4 @@
define(['require', 'browser', 'globalize', 'connectionManager', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'dom', 'clearButtonStyle', 'css!./guide.css', 'material-icons', 'scrollStyles', 'emby-button', 'paper-icon-button-light'], function (require, browser, globalize, connectionManager, serverNotifications, loading, datetime, focusManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, registrationServices, dom) {
define(['require', 'browser', 'globalize', 'connectionManager', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'dom', 'clearButtonStyle', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-button', 'paper-icon-button-light'], function (require, browser, globalize, connectionManager, serverNotifications, loading, datetime, focusManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, registrationServices, dom) {
function showViewSettings(instance) {

View file

@ -0,0 +1,15 @@
.newTvProgram {
background: #64A239;
}
.liveTvProgram {
background: #EC407A;
}
.premiereTvProgram {
background: #EF6C00;
}
.repeatTvProgram {
background: #009688;
}

View file

@ -54,7 +54,6 @@
.mediaInfoProgramAttribute {
color: #fff;
text-transform: uppercase;
background: #EF6C00;
padding: .16em .6em;
border-radius: .15em;
font-size: 80%;

View file

@ -1,4 +1,4 @@
define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', 'css!./mediainfo.css'], function (datetime, globalize, embyRouter, itemHelper) {
define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', 'css!./mediainfo.css', 'programStyles'], function (datetime, globalize, embyRouter, itemHelper) {
function getProgramInfoHtml(item, options) {
var html = '';
@ -159,22 +159,22 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', '
if (item.IsLive) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#Live') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">' + globalize.translate('sharedcomponents#Live') + '</div>'
});
}
else if (item.IsPremiere) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#Premiere') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">' + globalize.translate('sharedcomponents#Premiere') + '</div>'
});
}
else if (item.IsSeries && !item.IsRepeat) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#AttributeNew') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">' + globalize.translate('sharedcomponents#AttributeNew') + '</div>'
});
}
else if (item.IsSeries && item.IsRepeat) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#Repeat') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">' + globalize.translate('sharedcomponents#Repeat') + '</div>'
});
}

View file

@ -24,6 +24,10 @@
margin-top: .5em;
}
.recordingDialog-btnRecord {
background-color: #cc3333;
}
@media all and (max-width: 800px) {
.programDialog-itemName {

View file

@ -65,7 +65,7 @@
<button is="emby-button" type="button" class="raised btnPlay btnPlay-notplayable hide block formDialogFooterItem button-submit">
<span>${Play}</span>
</button>
<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit" style="background:#cc3333;">
<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit recordingDialog-btnRecord">
<span>${Record}</span>
</button>
</div>