From c17d97e0ba2b54303298005ef9361e3a2b45924b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 13 May 2016 14:28:05 -0400 Subject: [PATCH] update shared dialogs --- .../emby-webcomponents/.bower.json | 8 +- .../dialoghelper/dialoghelper.js | 11 +- .../emby-webcomponents/formdialog.css | 5 +- .../emby-webcomponents/itemcontextmenu.js | 101 ++++++++++++++++++ .../recordingcreator/recordingcreator.js | 12 ++- .../recordingcreator.template.html | 26 +++-- .../emby-webcomponents/require/requiretext.js | 6 +- .../sharing/sharingmanager.js | 4 +- .../emby-webcomponents/shell.js | 14 +++ .../emby-webcomponents/strings/en-US.json | 4 +- .../iron-a11y-announcer/.bower.json | 6 +- .../iron-selector/.bower.json | 4 +- .../paper-behaviors/.bower.json | 4 +- .../bower_components/paper-ripple/.bower.json | 6 +- .../collectioneditor/collectioneditor.js | 2 +- .../fileorganizer/fileorganizer.template.html | 2 +- .../guestinviter/guestinviter.template.html | 2 +- .../itemidentifier.template.html | 2 +- .../medialibrarycreator.template.html | 2 +- .../metadataeditor.template.html | 2 +- .../metadataeditor/personeditor.template.html | 2 +- .../playlisteditor/playlisteditor.js | 2 +- .../recordingeditor.template.html | 2 +- .../subtitleeditor/subtitleeditor.js | 2 +- dashboard-ui/scripts/itemdetailpage.js | 2 + dashboard-ui/scripts/site.js | 30 ++++-- dashboard-ui/scripts/sync.js | 2 +- .../thirdparty/paper-button-style.css | 1 - 28 files changed, 204 insertions(+), 62 deletions(-) create mode 100644 dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js create mode 100644 dashboard-ui/bower_components/emby-webcomponents/shell.js diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 37fc0ce90e..4f44a24b85 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.3.7", - "_release": "1.3.7", + "version": "1.3.18", + "_release": "1.3.18", "_resolution": { "type": "version", - "tag": "1.3.7", - "commit": "106e16436f7c13ea1317d2bf98c89eac8fa63668" + "tag": "1.3.18", + "commit": "127ca5da89083c44351fd0664355f3f521313d5d" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js index f77864d861..4a93209647 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js @@ -1,5 +1,7 @@ define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'scrollHelper', 'css!./dialoghelper.css', 'scrollStyles'], function (historyManager, focusManager, browser, layoutManager, inputManager, scrollHelper) { + var globalOnOpenCallback; + function dialogHashHandler(dlg, hash, resolve) { var self = this; @@ -184,6 +186,10 @@ function open(dlg) { + if (globalOnOpenCallback) { + globalOnOpenCallback(dlg); + } + return new Promise(function (resolve, reject) { new dialogHashHandler(dlg, 'dlg' + new Date().getTime(), resolve); @@ -403,6 +409,9 @@ return { open: open, close: close, - createDialog: createDialog + createDialog: createDialog, + setOnOpen: function (val) { + globalOnOpenCallback = val; + } }; }); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css index 8b82f2a1d6..296942546a 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css +++ b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css @@ -21,14 +21,11 @@ .formDialog .dialogContent { flex-grow: 1; - flex-shrink: 0; - width: 100%; - height: 100%; } .formDialog .dialogContentInner { padding-bottom: 50vh; - padding-top: 1.5em; + padding-top: 1em; } @media all and (min-width: 1000px) { diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js new file mode 100644 index 0000000000..b5d11d830c --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js @@ -0,0 +1,101 @@ +define(['apphost', 'globalize', 'connectionManager'], function (appHost, globalize, connectionManager) { + + function getCommands(options) { + + var item = options.item; + + var serverId = item.ServerId; + var apiClient = connectionManager.getApiClient(serverId); + + return apiClient.getCurrentUser().then(function (user) { + + var commands = []; + + if (item.CanDownload && user.Policy.EnableContentDownloading && appHost.supports('filedownload')) { + commands.push({ + name: globalize.translate('sharedcomponents#Download'), + id: 'download' + }); + } + + if (item.Type != 'Timer' && user.Policy.EnablePublicSharing && appHost.supports('sharing')) { + commands.push({ + name: globalize.translate('Share'), + id: 'share' + }); + } + + return commands; + }); + } + + function executeCommand(item, id) { + + var itemId = item.Id; + var serverId = item.ServerId; + var apiClient = connectionManager.getApiClient(serverId); + + return new Promise(function (resolve, reject) { + + switch (id) { + + case 'download': + { + require(['fileDownloader'], function (fileDownloader) { + var downloadHref = apiClient.getUrl("Items/" + itemId + "/Download", { + api_key: apiClient.accessToken() + }); + + fileDownloader.download([ + { + url: downloadHref, + itemId: itemId, + serverId: serverId + }]); + + reject(); + }); + + break; + } + case 'share': + { + require(['sharingmanager'], function (sharingManager) { + sharingManager.showMenu({ + serverId: serverId, + itemId: itemId + + }).then(reject); + }); + break; + } + default: + break; + } + }); + } + + function show(options) { + + return getCommands(options).then(function (commands) { + + return new Promise(function (resolve, reject) { + + require(['actionsheet'], function (actionSheet) { + + actionSheet.show({ + items: commands + }).then(function (id) { + executeCommand(options.item, id).then(resolve); + }, reject); + }); + }); + + }); + } + + return { + getCommands: getCommands, + show: show + }; +}); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js index b7722ba6b6..acbd4b581c 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'scrollStyles', 'paper-checkbox', 'paper-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper) { +define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'connectionManager', 'require', 'loading', 'scrollHelper', 'scrollStyles', 'paper-checkbox', 'emby-collapsible', 'paper-input', 'paper-icon-button-light', 'css!./../formdialog', 'css!./recordingcreator', 'html!./../icons/mediainfo.html', 'html!./../icons/nav.html'], function (dialogHelper, globalize, layoutManager, mediaInfo, appHost, connectionManager, require, loading, scrollHelper) { var currentProgramId; var currentServerId; @@ -261,6 +261,12 @@ context.querySelector('#chkConvertRecordings').checked = config.EnableRecordingEncoding; }); + + if (layoutManager.tv) { + context.querySelector('.advanced').classList.add('hide'); + } else { + context.querySelector('.advanced').classList.remove('hide'); + } } function selectDays(page, days) { @@ -399,9 +405,7 @@ reload(dlg, itemId); - setTimeout(function () { - dialogHelper.open(dlg); - }, 1000); + dialogHelper.open(dlg); }); }); } diff --git a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html index 3962726b5d..855a356131 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html @@ -43,15 +43,23 @@
${OptionConvertRecordingsToStreamingFormat}
${OptionConvertRecordingsToStreamingFormatHelp}
-
${FeatureRequiresEmbyPremiere}
+
+ ${FeatureRequiresEmbyPremiere} +
-
-
- -
-
-
- +
+
+
+ +
+ +
+
+
+ +
+ +

@@ -60,7 +68,7 @@

${HeaderEnjoyDayTrial}

${HeaderBecomeProjectSupporter}
- ${Record} + ${Record}


diff --git a/dashboard-ui/bower_components/emby-webcomponents/require/requiretext.js b/dashboard-ui/bower_components/emby-webcomponents/require/requiretext.js index 55c75ffcaa..a93bae6302 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/require/requiretext.js +++ b/dashboard-ui/bower_components/emby-webcomponents/require/requiretext.js @@ -1,7 +1,5 @@ define(function () { - var importedFiles = []; - return { load: function (url, req, load, config) { @@ -10,7 +8,9 @@ define(function () { url = config.baseUrl + url; } - url = url + "?" + config.urlArgs; + if (config.urlArgs) { + url += config.urlArgs(url, url); + } var xhr = new XMLHttpRequest(); xhr.open('GET', url, true); diff --git a/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js b/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js index facbbc39e1..c3e7f26e15 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js +++ b/dashboard-ui/bower_components/emby-webcomponents/sharing/sharingmanager.js @@ -8,10 +8,8 @@ // Delete the share since it was cancelled apiClient.ajax({ - type: 'DELETE', url: apiClient.getUrl('Social/Shares/' + shareId) - }); } @@ -41,7 +39,7 @@ loading.hide(); - sharingMenu.showMenu(options).then(function() { + return sharingMenu.showMenu(options).then(function () { console.log('share success. shareId: ' + options.share.Id); }, function () { onSharingCancel(options, apiClient); diff --git a/dashboard-ui/bower_components/emby-webcomponents/shell.js b/dashboard-ui/bower_components/emby-webcomponents/shell.js new file mode 100644 index 0000000000..824aab0725 --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/shell.js @@ -0,0 +1,14 @@ +define([], function () { + + return { + openUrl: function (url) { + window.open(url, '_blank'); + }, + canExec: false, + exec: function (options) { + // options.path + // options.arguments + return Promise.reject(); + } + }; +}); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index 50adac9ee0..117e8a92bd 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -45,5 +45,7 @@ "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format", "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.", "FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription.", - "Record": "Record" + "Record": "Record", + "Download": "Download", + "Advanced": "Advanced" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json b/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json index d0996a0614..1baafa9707 100644 --- a/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json @@ -30,14 +30,14 @@ "web-component-tester": "polymer/web-component-tester#^3.4.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/iron-a11y-announcer", + "homepage": "https://github.com/polymerelements/iron-a11y-announcer", "_release": "1.0.4", "_resolution": { "type": "version", "tag": "v1.0.4", "commit": "5ce3eb8c4282bb53cd72e348858dc6be6b4c50b9" }, - "_source": "git://github.com/PolymerElements/iron-a11y-announcer.git", + "_source": "git://github.com/polymerelements/iron-a11y-announcer.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-a11y-announcer" + "_originalSource": "polymerelements/iron-a11y-announcer" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 1da99816d3..e5306ccfc9 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.5.1", "commit": "e3e34408fad8f7cde59c4255cf3fe90f7dcf91d8" }, - "_source": "git://github.com/polymerelements/iron-selector.git", + "_source": "git://github.com/PolymerElements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-selector" + "_originalSource": "PolymerElements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 2b04bf9f8a..a6b333d335 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -45,7 +45,7 @@ "tag": "v1.0.11", "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" }, - "_source": "git://github.com/PolymerElements/paper-behaviors.git", + "_source": "git://github.com/polymerelements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-behaviors" + "_originalSource": "polymerelements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 157225ee71..2f654d71c6 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_source": "git://github.com/PolymerElements/paper-ripple.git", + "_source": "git://github.com/polymerelements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-ripple" + "_originalSource": "polymerelements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/components/collectioneditor/collectioneditor.js b/dashboard-ui/components/collectioneditor/collectioneditor.js index f23f24b6c5..e8d1c1403d 100644 --- a/dashboard-ui/components/collectioneditor/collectioneditor.js +++ b/dashboard-ui/components/collectioneditor/collectioneditor.js @@ -201,7 +201,7 @@ var html = ''; var title = items.length ? Globalize.translate('HeaderAddToCollection') : Globalize.translate('HeaderNewCollection'); - html += '
'; + html += '
'; html += ''; html += '
'; html += title; diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.template.html b/dashboard-ui/components/fileorganizer/fileorganizer.template.html index 371b474738..7c72e7412d 100644 --- a/dashboard-ui/components/fileorganizer/fileorganizer.template.html +++ b/dashboard-ui/components/fileorganizer/fileorganizer.template.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html index 70b29085f5..ca896ea6c2 100644 --- a/dashboard-ui/components/guestinviter/guestinviter.template.html +++ b/dashboard-ui/components/guestinviter/guestinviter.template.html @@ -1,4 +1,4 @@ -
+
${HeaderInviteUser} diff --git a/dashboard-ui/components/itemidentifier/itemidentifier.template.html b/dashboard-ui/components/itemidentifier/itemidentifier.template.html index 8db9f92cb0..defaa96f3f 100644 --- a/dashboard-ui/components/itemidentifier/itemidentifier.template.html +++ b/dashboard-ui/components/itemidentifier/itemidentifier.template.html @@ -1,4 +1,4 @@ -
+
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html index 60818bbc69..cdd7d021db 100644 --- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html +++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html @@ -1,4 +1,4 @@ -
+
${ButtonAddMediaLibrary} diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html index 3489e3d8c8..9836699146 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html +++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html @@ -1,4 +1,4 @@ -
+
${ButtonEdit} diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/components/metadataeditor/personeditor.template.html index b94328b6f6..ce19bc7830 100644 --- a/dashboard-ui/components/metadataeditor/personeditor.template.html +++ b/dashboard-ui/components/metadataeditor/personeditor.template.html @@ -1,4 +1,4 @@ -
+
${ButtonEdit} diff --git a/dashboard-ui/components/playlisteditor/playlisteditor.js b/dashboard-ui/components/playlisteditor/playlisteditor.js index a01b7397d9..8f90e9a03e 100644 --- a/dashboard-ui/components/playlisteditor/playlisteditor.js +++ b/dashboard-ui/components/playlisteditor/playlisteditor.js @@ -207,7 +207,7 @@ var title = Globalize.translate('HeaderAddToPlaylist'); - html += '
'; + html += '
'; html += ''; html += '
'; html += title; diff --git a/dashboard-ui/components/recordingeditor/recordingeditor.template.html b/dashboard-ui/components/recordingeditor/recordingeditor.template.html index 0717f7558e..87a55ce207 100644 --- a/dashboard-ui/components/recordingeditor/recordingeditor.template.html +++ b/dashboard-ui/components/recordingeditor/recordingeditor.template.html @@ -1,4 +1,4 @@ -
+
${ButtonEdit} diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.js b/dashboard-ui/components/subtitleeditor/subtitleeditor.js index c225ba9c5c..5d27051dcf 100644 --- a/dashboard-ui/components/subtitleeditor/subtitleeditor.js +++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.js @@ -362,7 +362,7 @@ dlg.classList.add('background-theme-b'); var html = ''; - html += '
'; + html += '
'; html += ''; html += '
'; html += item.Name; diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 8839ef878f..68df3223a5 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -2032,6 +2032,8 @@ $('.btnRecord,.btnFloatingRecord', page).on('click', function () { var id = getParameterByName('id'); + Dashboard.showLoadingMsg(); + require(['recordingCreator'], function (recordingCreator) { recordingCreator.show(id, currentItem.ServerId).then(function () { reload(page); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index bdfbf5dacb..57b4ff44e8 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1833,6 +1833,12 @@ var AppInfo = {}; return viewManager; }); + if (Dashboard.isRunningInCordova() && browserInfo.android) { + define("shell", ["cordova/android/shell"], returnFirstDependency); + } else { + define("shell", [embyWebComponentsBowerPath + "/shell"], returnFirstDependency); + } + define("sharingmanager", [embyWebComponentsBowerPath + "/sharing/sharingmanager"], returnFirstDependency); if (Dashboard.isRunningInCordova()) { @@ -1979,7 +1985,6 @@ var AppInfo = {}; define("swiper", [bowerPath + "/Swiper/dist/js/swiper.min", "css!" + bowerPath + "/Swiper/dist/css/swiper.min"], returnFirstDependency); - define("dialogHelper", [embyWebComponentsBowerPath + "/dialoghelper/dialoghelper"], returnFirstDependency); define("toast", [embyWebComponentsBowerPath + "/toast/toast"], returnFirstDependency); define("scrollHelper", [embyWebComponentsBowerPath + "/scrollhelper"], returnFirstDependency); @@ -2009,6 +2014,12 @@ var AppInfo = {}; return jQuery; }); + define("dialogHelper", [embyWebComponentsBowerPath + "/dialoghelper/dialoghelper"], function (dialoghelper) { + + dialoghelper.setOnOpen(onDialogOpen); + return dialoghelper; + }); + // alias define("historyManager", [], function () { return Emby.Page; @@ -2057,8 +2068,6 @@ var AppInfo = {}; }; }); - define('dialogText', ['globalize'], getDialogText()); - define("embyRouter", [embyWebComponentsBowerPath + '/router'], function (embyRouter) { embyRouter.showLocalLogin = function (apiClient, serverId, manualLogin) { @@ -2111,14 +2120,13 @@ var AppInfo = {}; return appSettings; } - function getDialogText() { - return function (globalize) { - return { - get: function (text) { - return globalize.translate('Button' + text); - } - }; - }; + function onDialogOpen(dlg) { + if (dlg.classList.contains('formDialog')) { + if (!dlg.classList.contains('background-theme-a')) { + dlg.classList.add('background-theme-b'); + dlg.classList.add('ui-body-b'); + } + } } function initRequireWithBrowser(browser) { diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index cb8160a4a8..e1b18383df 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -249,7 +249,7 @@ dlg.classList.add('popupEditor'); var html = ''; - html += '
'; + html += '
'; html += ''; html += '
'; html += Globalize.translate('SyncMedia'); diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index f4c566eea8..9558613098 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -525,7 +525,6 @@ paper-radio-group > * { } div.dialogHeader { - margin: 0 0 2em !important; padding: .35em .5em; display: flex; align-items: center;