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 branch 'master' into release-10.2.z

Browse source
This commit is contained in:
Joshua M. Boniface 2019-02-17 13:10:55 -05:00 • committed by GitHub
commit 058b3c8ab0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 11 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/bower_components/emby-webcomponents/homesections/homesections.js vendored
View file

@ -68,20 +68,6 @@ define(['connectionManager', 'cardBuilder', 'registrationServices', 'appSettings
return Promise.all(promises).then(function () {
html = '';
var style = 'margin-top:4em;';
if (layoutManager.tv) {
style += 'padding: 0 7.5%;';
}
html += '<div class="verticalSection padded-left padded-right customizeSection hide" style="' + style + '">';
html += '<a href="' + appRouter.getRouteUrl('settings') + '" is="emby-linkbutton" class="raised block"><span>' + globalize.translate('HeaderCustomizeHomeScreen') + '</span></a>';
html += '</div>';
elem.insertAdjacentHTML('beforeend', html);
return resume(elem, {
refresh: true,
returnPromise: false
@ -125,9 +111,7 @@ define(['connectionManager', 'cardBuilder', 'registrationServices', 'appSettings
promises.push(elems[i].resume(options));
}
var promise = Promise.all(promises).then(function () {
elem.querySelector('.customizeSection').classList.remove('hide');
});
var promise = Promise.all(promises);
if (!options || options.returnPromise !== false) {
return promise;

2
src/bower_components/emby-webcomponents/subtitleeditor/subtitleeditor.template.html vendored
View file

@ -2,7 +2,7 @@
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
<h3 class="formDialogHeaderTitle">${Subtitles}</h3>
<a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
<a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216115510/https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
</div>
<div class="formDialogContent smoothScrollY">