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

update vtt headers

Browse source
This commit is contained in:
Luke Pulverenti 2016-06-05 14:51:18 -04:00
parent e97c785c73
commit e4417bff1a
11 changed files with 54 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -1,6 +1,6 @@
[is="emby-button"] { [is="emby-button"] {
position: relative; position: relative;
display: inline-flex; display: inline-block;
align-items: center; align-items: center;
box-sizing: border-box; box-sizing: border-box;
margin: 0 .29em; margin: 0 .29em;
@ -30,12 +30,42 @@
text-transform: uppercase; text-transform: uppercase;
} }
[is="emby-button"].raised { [is="emby-button"].raised, [is="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); 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);
} }
[is="emby-button"].fab {
border-radius: 50%;
min-width: 56px;
min-height: 56px;
height: 5.2vh;
width: 5.2vh;
background-color: #444;
padding: .6em;
box-sizing: border-box;
display: inline-flex;
align-items: center;
justify-content: center;
text-align: center;
color: #fff !important;
margin: 0;
}
[is="emby-button"].fab.mini {
min-width: 40px !important;
min-height: 40px !important;
height: 3.3vh !important;
width: 3.3vh !important;
}
[is="emby-button"].fab iron-icon {
width: 100%;
height: 100%;
vertical-align: middle;
}
[is="emby-button"].block { [is="emby-button"].block {
display: flex; display: block;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
margin: .25em 0; margin: .25em 0;

4
dashboard-ui/components/directorybrowser/directorybrowser.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'jQuery', 'paper-item', 'paper-input', 'paper-fab', 'paper-item-body', 'paper-icon-button-light'], function (dialogHelper, $) { define(['dialogHelper', 'jQuery', 'paper-item', 'paper-input', 'emby-button', 'paper-item-body', 'paper-icon-button-light'], function (dialogHelper, $) {
var systemInfo; var systemInfo;
function getSystemInfo() { function getSystemInfo() {
@ -219,7 +219,7 @@
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<h2 class="dialogHeader">';
html += '<paper-fab icon="arrow-back" mini class="btnCloseDialog"></paper-fab>'; html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>';
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + (options.header || Globalize.translate('HeaderSelectPath')) + '</div>'; html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + (options.header || Globalize.translate('HeaderSelectPath')) + '</div>';
html += '</h2>'; html += '</h2>';

4
dashboard-ui/components/imageeditor/imageeditor.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'jQuery', 'css!css/metadataeditor.css', 'paper-fab', 'paper-icon-button-light'], function (dialogHelper, $) { define(['dialogHelper', 'jQuery', 'css!css/metadataeditor.css', 'emby-button', 'paper-fab', 'paper-icon-button-light'], function (dialogHelper, $) {
var currentItem; var currentItem;
var currentDeferred; var currentDeferred;
@ -257,7 +257,7 @@
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<h2 class="dialogHeader">';
html += '<paper-fab icon="arrow-back" mini class="btnCloseDialog" tabindex="-1"></paper-fab>'; html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>';
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + item.Name + '</div>'; html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + item.Name + '</div>';
html += '</h2>'; html += '</h2>';

4
dashboard-ui/components/imageuploader/imageuploader.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'jQuery', 'paper-fab'], function (dialogHelper, $) { define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
var currentItemId; var currentItemId;
var currentFile; var currentFile;
@ -149,7 +149,7 @@
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<h2 class="dialogHeader">';
html += '<paper-fab icon="arrow-back" mini class="btnCloseDialog" tabindex="-1"></paper-fab>'; html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>';
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + Globalize.translate('HeaderUploadImage') + '</div>'; html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + Globalize.translate('HeaderUploadImage') + '</div>';
html += '</h2>'; html += '</h2>';

2
dashboard-ui/components/itemidentifier/itemidentifier.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'loading', 'jQuery', 'paper-fab', 'emby-input', 'paper-checkbox', 'paper-icon-button-light'], function (dialogHelper, loading, $) { define(['dialogHelper', 'loading', 'jQuery', 'emby-input', 'paper-checkbox', 'paper-icon-button-light'], function (dialogHelper, loading, $) {
var currentItem; var currentItem;
var currentItemType; var currentItemType;

6
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View file

@ -1,4 +1,4 @@
define(['dialogHelper', 'jQuery', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function (dialogHelper, $) { define(['dialogHelper', 'jQuery', 'emby-button', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], function (dialogHelper, $) {
var currentDeferred; var currentDeferred;
var hasChanges; var hasChanges;
@ -59,7 +59,7 @@
html += '<paper-icon-item role="menuitem" class="lnkPath">'; html += '<paper-icon-item role="menuitem" class="lnkPath">';
html += '<paper-fab mini style="background:#52B54B;" icon="folder" item-icon></paper-fab>'; html += '<button type="button" is="emby-button" style="background:#52B54B;" class="fab mini" item-icon><iron-icon icon="folder"></iron-icon></button>';
html += '<paper-item-body>'; html += '<paper-item-body>';
html += path; html += path;
@ -163,7 +163,7 @@
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<h2 class="dialogHeader">';
html += '<paper-fab icon="arrow-back" mini class="btnCloseDialog" tabindex="-1"></paper-fab>'; html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog" tabindex="-1"><iron-icon icon="arrow-back"></iron-icon></button>';
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + options.library.Name + '</div>'; html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + options.library.Name + '</div>';
html += '</h2>'; html += '</h2>';

2
dashboard-ui/components/viewcontainer-lite.js
View file

@ -209,6 +209,8 @@ define(['browser'], function (browser) {
function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) { function animate(newAnimatedPage, oldAnimatedPage, transition, isBack) {
transition = transition || 'fade';
if (enableAnimation() && oldAnimatedPage && newAnimatedPage.animate) { if (enableAnimation() && oldAnimatedPage && newAnimatedPage.animate) {
if (transition == 'slide') { if (transition == 'slide') {
return slide(newAnimatedPage, oldAnimatedPage, transition, isBack); return slide(newAnimatedPage, oldAnimatedPage, transition, isBack);

13
dashboard-ui/css/librarybrowser.css
View file

@ -402,24 +402,19 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
font-size: 90%; font-size: 90%;
} }
.detailFloatingButton { [is="emby-button"].detailFloatingButton {
width: 56px; width: 56px !important;
height: 56px; height: 56px !important;
top: -28px; top: -28px;
position: absolute; position: absolute;
right: 25%; right: 25%;
background-color: #52B54B !important; background-color: #52B54B !important;
} }
.btnFloatingRecord { [is="emby-button"].btnFloatingRecord {
background-color: #cc3333 !important; background-color: #cc3333 !important;
} }
.detailFloatingButton iron-icon {
width: 40px;
height: 40px;
}
@media all and (max-width: 1000px) { @media all and (max-width: 1000px) {
.primaryDetailsContainer { .primaryDetailsContainer {

6
dashboard-ui/itemdetails.html
View file

@ -9,8 +9,8 @@
<div class="detailPageContent" style="position:relative;"> <div class="detailPageContent" style="position:relative;">
<paper-fab class="btnPlay detailFloatingButton hide" icon="play-arrow" title="${ButtonPlay}"></paper-fab> <button is="emby-button" type="button" class="btnPlay detailFloatingButton hide fab" title="${ButtonPlay}"><iron-icon icon="play-arrow"></iron-icon></button>
<paper-fab class="btnFloatingRecord detailFloatingButton hide" icon="videocam" title="${ButtonRecord}"></paper-fab> <button is="emby-button" type="button" class="btnFloatingRecord detailFloatingButton hide fab" title="${ButtonRecord}"><iron-icon icon="videocam"></iron-icon></button>
<div class="detailImageContainer"> <div class="detailImageContainer">
</div> </div>
@ -130,7 +130,7 @@
<p id="awardSummary"></p> <p id="awardSummary"></p>
<div class="paperList" id="criticRatingSummary"> <div class="paperList" id="criticRatingSummary">
<paper-icon-item> <paper-icon-item>
<paper-fab mini style="background-color: transparent; background-repeat: no-repeat; background-position: center center; background-size: cover; background-image: url(css/images/fresh.png);" item-icon></paper-fab> <button is="emby-button" type="button" class="mini fab" style="background-color: transparent; background-repeat: no-repeat; background-position: center center; background-size: cover; background-image: url(css/images/fresh.png);" item-icon></button>
<paper-item-body three-line> <paper-item-body three-line>
<div>TOMATOMETER®</div> <div>TOMATOMETER®</div>
<div class="criticRatingScore"></div> <div class="criticRatingScore"></div>

2
dashboard-ui/scripts/librarymenu.js
View file

@ -742,7 +742,7 @@
var helpUrl = page.getAttribute('data-helpurl'); var helpUrl = page.getAttribute('data-helpurl');
if (helpUrl) { if (helpUrl) {
html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:2em;" title="' + Globalize.translate('ButtonHelp') + '"><button is="emby-button" type="button" class="accent" style="margin:0;font-weight:normal;font-size:13px;padding:.25em;display:flex;align-items:center;"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></button></a>'; html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:2em;" title="' + Globalize.translate('ButtonHelp') + '"><button is="emby-button" type="button" class="accent" style="margin:0;font-weight:normal;font-size:13px;padding:.25em;display:block;align-items:center;"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></button></a>';
} }
} }

2
dashboard-ui/scripts/site.js
View file

@ -2564,7 +2564,7 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/itemdetails.html', path: '/itemdetails.html',
dependencies: ['emby-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'], dependencies: ['emby-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'],
controller: 'scripts/itemdetailpage', controller: 'scripts/itemdetailpage',
autoFocus: false, autoFocus: false,
transition: 'fade' transition: 'fade'