diff --git a/dashboard-ui/about.html b/dashboard-ui/about.html index f1aca00e1f..8a94e4d8c0 100644 --- a/dashboard-ui/about.html +++ b/dashboard-ui/about.html @@ -4,7 +4,7 @@

- EMBY +



diff --git a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js index c6c5d5b751..3cbc378ed5 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js +++ b/dashboard-ui/bower_components/emby-webcomponents/itemcontextmenu.js @@ -45,16 +45,14 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter', if (itemHelper.canEdit(user, item.Type)) { - if (isMobileApp) { - if (options.edit !== false) { + if (options.edit !== false) { - var text = item.Type == 'Timer' ? globalize.translate('sharedcomponents#Edit') : globalize.translate('sharedcomponents#EditInfo'); + var text = item.Type == 'Timer' ? globalize.translate('sharedcomponents#Edit') : globalize.translate('sharedcomponents#EditInfo'); - commands.push({ - name: text, - id: 'edit' - }); - } + commands.push({ + name: text, + id: 'edit' + }); } } @@ -524,9 +522,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'embyRouter', recordingEditor.show(item.Id, serverId).then(resolve, reject); }); } else { - require(['components/metadataeditor/metadataeditor'], function (metadataeditor) { + require(['metadataEditor'], function (metadataEditor) { - metadataeditor.show(item.Id, serverId).then(resolve, reject); + metadataEditor.show(item.Id, serverId).then(resolve, reject); }); } }); diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js similarity index 99% rename from dashboard-ui/components/metadataeditor/metadataeditor.js rename to dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js index 11f209ac20..ffb4cbe354 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.js +++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.js @@ -258,9 +258,9 @@ function editPerson(context, person, index) { - require(['components/metadataeditor/personeditor'], function (personeditor) { + require(['personEditor'], function (personEditor) { - personeditor.show(person).then(function (updatedPerson) { + personEditor.show(person).then(function (updatedPerson) { var isNew = index == -1; diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html similarity index 99% rename from dashboard-ui/components/metadataeditor/metadataeditor.template.html rename to dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html index 455a9bae32..5f2a2c38da 100644 --- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html +++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/metadataeditor.template.html @@ -16,7 +16,7 @@
-
+
diff --git a/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js new file mode 100644 index 0000000000..b5789b1d1b --- /dev/null +++ b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js @@ -0,0 +1,66 @@ +define(['dialogHelper', 'globalize', 'require', 'paper-icon-button-light', 'emby-input', 'emby-select'], function (dialogHelper, globalize, require) { + + function show(person) { + return new Promise(function (resolve, reject) { + + require(['text!./personeditor.template.html'], function (template) { + + var dlg = dialogHelper.createDialog({ + removeOnClose: true, + size: 'medium' + }); + + dlg.classList.add('ui-body-b'); + dlg.classList.add('background-theme-b'); + + dlg.classList.add('formDialog'); + + var html = ''; + var submitted = false; + + html += globalize.translateDocument(template); + + dlg.innerHTML = html; + document.body.appendChild(dlg); + + dlg.querySelector('.txtPersonName', dlg).value = person.Name || ''; + dlg.querySelector('.selectPersonType', dlg).value = person.Type || ''; + dlg.querySelector('.txtPersonRole', dlg).value = person.Role || ''; + + dialogHelper.open(dlg); + + dlg.addEventListener('close', function () { + + if (submitted) { + resolve(person); + } else { + reject(); + } + }); + + dlg.querySelector('.btnCancel').addEventListener('click', function (e) { + + dialogHelper.close(dlg); + }); + + dlg.querySelector('form').addEventListener('submit', function (e) { + + submitted = true; + + person.Name = dlg.querySelector('.txtPersonName', dlg).value; + person.Type = dlg.querySelector('.selectPersonType', dlg).value; + person.Role = dlg.querySelector('.txtPersonRole', dlg).value || null; + + dialogHelper.close(dlg); + + e.preventDefault(); + return false; + }); + }); + }); + } + + return { + show: show + }; +}); \ No newline at end of file diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html similarity index 100% rename from dashboard-ui/components/metadataeditor/personeditor.template.html rename to dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html diff --git a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js index 4617385a22..01c8f91edb 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js +++ b/dashboard-ui/bower_components/emby-webcomponents/shortcuts.js @@ -299,9 +299,9 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'embyRouter', 'g recordingEditor.show(item.Id, serverId).then(resolve, reject); }); } else { - require(['components/metadataeditor/metadataeditor'], function (metadataeditor) { + require(['metadataEditor'], function (metadataEditor) { - metadataeditor.show(item.Id, serverId).then(resolve, reject); + metadataEditor.show(item.Id, serverId).then(resolve, reject); }); } }); diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.css b/dashboard-ui/components/directorybrowser/directorybrowser.css new file mode 100644 index 0000000000..dffe03a704 --- /dev/null +++ b/dashboard-ui/components/directorybrowser/directorybrowser.css @@ -0,0 +1,23 @@ +#ulDirectoryPickerList a { + padding-top: .4em; + padding-bottom: .4em; +} + +.lblDirectoryPickerPath { + white-space: nowrap; +} + +.directoryPickerHeadline { + color: #000; + background: #fff3a5; + padding: 1em; + border-radius: 5px; + margin-top: 2em; +} + +.directoryPicker paper-item { + min-height: 36px; + border-bottom: 1px solid #eee; + outline: none; + cursor: pointer; +} \ No newline at end of file diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js index 7b9e110d0b..9d86a27fe0 100644 --- a/dashboard-ui/components/directorybrowser/directorybrowser.js +++ b/dashboard-ui/components/directorybrowser/directorybrowser.js @@ -1,4 +1,4 @@ -define(['dialogHelper', 'jQuery', 'paper-item', 'emby-input', 'emby-button', 'paper-item-body', 'paper-icon-button-light'], function (dialogHelper, $) { +define(['dialogHelper', 'jQuery', 'paper-item', 'emby-input', 'emby-button', 'paper-item-body', 'paper-icon-button-light', 'css!./directorybrowser'], function (dialogHelper, $) { var systemInfo; function getSystemInfo() { diff --git a/dashboard-ui/components/metadataeditor/personeditor.js b/dashboard-ui/components/metadataeditor/personeditor.js deleted file mode 100644 index fa32e8a3f3..0000000000 --- a/dashboard-ui/components/metadataeditor/personeditor.js +++ /dev/null @@ -1,70 +0,0 @@ -define(['dialogHelper', 'paper-icon-button-light', 'emby-input', 'emby-select'], function (dialogHelper) { - - return { - show: function (person) { - return new Promise(function (resolve, reject) { - - var xhr = new XMLHttpRequest(); - xhr.open('GET', 'components/metadataeditor/personeditor.template.html', true); - - xhr.onload = function (e) { - - var template = this.response; - var dlg = dialogHelper.createDialog({ - removeOnClose: true, - size: 'medium' - }); - - dlg.classList.add('ui-body-b'); - dlg.classList.add('background-theme-b'); - - dlg.classList.add('formDialog'); - - var html = ''; - var submitted = false; - - html += Globalize.translateDocument(template); - - dlg.innerHTML = html; - document.body.appendChild(dlg); - - dlg.querySelector('.txtPersonName', dlg).value = person.Name || ''; - dlg.querySelector('.selectPersonType', dlg).value = person.Type || ''; - dlg.querySelector('.txtPersonRole', dlg).value = person.Role || ''; - - dialogHelper.open(dlg); - - dlg.addEventListener('close', function () { - - if (submitted) { - resolve(person); - } else { - reject(); - } - }); - - dlg.querySelector('.btnCancel').addEventListener('click', function (e) { - - dialogHelper.close(dlg); - }); - - dlg.querySelector('form').addEventListener('submit', function (e) { - - submitted = true; - - person.Name = dlg.querySelector('.txtPersonName', dlg).value; - person.Type = dlg.querySelector('.selectPersonType', dlg).value; - person.Role = dlg.querySelector('.txtPersonRole', dlg).value || null; - - dialogHelper.close(dlg); - - e.preventDefault(); - return false; - }); - } - - xhr.send(); - }); - } - }; -}); \ No newline at end of file diff --git a/dashboard-ui/css/dashboard.css b/dashboard-ui/css/dashboard.css index f64c8a1939..a9b879fc29 100644 --- a/dashboard-ui/css/dashboard.css +++ b/dashboard-ui/css/dashboard.css @@ -1,4 +1,314 @@ -/* Swatches */ +/* For some reason jquery mobile 1.4.5 wants to horitontally pad mini form fields. */ +.ui-mini { + margin-left: 0; +} + +iron-icon { + min-width: 24px; + min-height: 24px; +} + +.ui-body-a select { + background: none; + border-color: #757575; +} + + .ui-body-a select option { + color: #000; + } + +.paperCheckboxFieldDescription { + padding-left: 31px; + padding-top: 5px; +} + +paper-input + .fieldDescription { + padding-top: 5px; + opacity: .9; +} + +/* Tabs (e.g. advanced metadata page) */ +.localnav { + margin-bottom: 30px !important; +} + +@media all and (min-width: 800px) { + + .type-interior > .ui-content, .type-interior > .ui-panel-content-wrap > .ui-content { + padding-right: 0; + padding-left: 0; + padding-top: 0; + overflow: hidden; + } +} + +.ui-body-a .emby-collapsible-button { + border: 0; + background-color: #e8e8e8; + text-transform: none; +} + +.ui-body-a .emby-collapsible-title { + margin: .25em 0; + color: #000; + padding: 0 0 0 .5em; + font-weight: 500; +} + +.ui-body-a .emby-collapsible-content, .ui-body-a .collapseContent { + border-width: 0; + padding: 1em 1.25em; + background-color: #fff; +} + +.dashboardDocument .lnkMySync { + display: none !important; +} + +.dashboardDocument .dashboardEntryHeaderButton { + display: none !important; +} + +.dashboardDocument .lnkManageServer { + display: none !important; +} + +.dashboardDocument .headerVoiceButton { + display: none !important; +} + +.dashboardDocument .btnCast, .dashboardDocument .headerSelectedPlayer { + display: none !important; +} + +.adminDrawer { + background: #fff !important; +} + +.dashboardDocument .mainDrawerPanelContent { + transition: left ease-in-out 0.3s, padding ease-in-out 0.3s; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; +} + +.adminDrawer { + background: #fff !important; +} + +.dashboardDocument .mainDrawerPanelContent { + transition: left ease-in-out 0.3s, padding ease-in-out 0.3s; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; +} + +@media all and (min-width: 640px) { + + .dashboardDocument .mainDrawer { + z-index: 998 !important; + top: 65px !important; + left: 0 !important; + transform: none !important; + } + + .dashboardDocument .tmla-mask { + display: none !important; + } + + .dashboardDocument .mainDrawerButton { + display: none !important; + } + + .dashboardDocument .libraryMenuButtonText { + font-size: 150%; + } + + .dashboardDocument .mainDrawerPanelContent { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 270px; + } + + .dashboardDocument .adminDrawerLogo { + display: none; + } +} + +.adminDrawer .sidebarLink { + color: #333 !important; + font-weight: 400 !important; + padding: .7em 0 .7em 1.5em; +} + +.adminDrawer .sidebarHeader { + color: #666 !important; + font-weight: 500 !important; +} + +.adminDrawer .sidebarLinkIcon { + color: #666; + margin-right: 1em; +} + +.adminDrawer .sidebarLink:hover { + color: #00897B !important; +} + +.adminDrawer .sidebarLink.selectedSidebarLink { + background: #52B54B !important; + color: #fff !important; +} + + .adminDrawer .sidebarLink.selectedSidebarLink .sidebarLinkIcon { + color: #fff !important; + } + +.adminDrawerLogo { + padding: 1.5em 1em 1.2em; + border-bottom: 1px solid #e0e0e0; + margin-bottom: 1em; + display: block; +} + + .adminDrawerLogo img { + height: 30px; + } + +@media all and (max-width: 640px) { + + .dashboardDocument .headerAppsButton { + display: none; + } +} + +/* Swatches */ + +paper-fab.blue { + background: #03a9f4; +} + +paper-checkbox #checkboxContainer { + width: 22px !important; + height: 22px !important; +} + +paper-checkbox paper-ripple { + top: -13px !important; + left: -13px !important; +} + +paper-checkbox #checkmark { + border-right-width: 4px !important; + border-bottom-width: 4px !important; +} + +.paperCheckboxList paper-checkbox { + display: block; + padding: .5em 0; +} + +paper-input label, paper-textarea label { + font-size: 18px !important; + font-family: inherit !important; +} + +.paperListLabel { + font-size: 16px; + margin-bottom: .5em; +} + +paper-fab { + vertical-align: middle; + display: inline-flex !important; +} + + paper-fab.mini { + width: 22px; + height: 22px; + } + + paper-fab.mini iron-icon { + width: 22px; + height: 22px; + } + +.ui-body-a paper-fab.subdued { + background: #fff; + color: #000; +} + + .ui-body-a paper-fab.subdued paper-material.keyboard-focus { + background: #686868 !important; + } + +paper-fab.white { + background: #fff; + color: #000; +} + + paper-fab.white paper-material.keyboard-focus { + background: #01579b !important; + color: #fff; + } + +paper-fab.square { + border-radius: 5px; +} + +paper-fab.accent { + background-color: #52B54B; +} + +paper-textarea.mono textarea { + font-family: monospace !important; +} + +.ui-body-a .paperCheckboxFieldDescription { + color: #333; +} + +.ui-body-a paper-checkbox #checkbox.checked.paper-checkbox { + background-color: #52B54B; + border-color: #52B54B; +} + +.ui-body-a .inputLabel, .ui-body-a .textareaLabel { + color: #555; +} + + .ui-body-a .inputLabel.focused:not(.blank), .ui-body-a .textareaLabel.focused:not(.blank) { + color: green; + } + +.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .paperListLabel, .ui-body-a .fieldDescription { + color: #555; +} + +.ui-body-a .paper-input-container-0 .input-content.label-is-highlighted.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.label-is-highlighted.paper-input-container .paper-input-label { + color: green; +} + +paper-input .focused-line, paper-textarea .focused-line { + background-color: #52B54B !important; +} + +.paperList { + padding: .5em 0; + margin: 12px auto; + 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); + background-color: #fff; +} + +.paperCheckboxList.paperList { + padding: .5em 1em; +} /* A -----------------------------------------------------------------------------------------------------------*/ @@ -696,4 +1006,4 @@ a[data-role='button'], .type-interior button:not([data-role='none']):not(.clearB .supporterMembershipDisabled .tabSupporterMembership { display: none; -} \ No newline at end of file +} diff --git a/dashboard-ui/css/fonts/Montserrat.woff b/dashboard-ui/css/fonts/Montserrat.woff deleted file mode 100644 index a4b2fb9fa1..0000000000 Binary files a/dashboard-ui/css/fonts/Montserrat.woff and /dev/null differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index ac7362cac9..7d34572088 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -96,10 +96,6 @@ } } -.libraryPage .currentUsername { - color: #fff; -} - .listHeader { margin: .25em 0; padding-left: 2px; @@ -597,14 +593,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { margin-left: 1em; } -.lblDetailTab { - border-color: #212121 !important; -} - -.editMetadataForm { - max-width: 100%; -} - .detailImageProgressContainer { position: absolute; bottom: 2px; @@ -1124,16 +1112,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -.channelHeader { - padding: 1em; - text-align: center; - border-bottom: 1px solid #333; -} - - .channelHeader a { - text-decoration: none; - } - @media all and (max-width: 1200px) { .listViewUserDataButtons { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 74beb5dffd..7b84a121f8 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -107,15 +107,6 @@ align-items: center; } -.logoLibraryMenuButtonText { - font-family: Montserrat; - color: #333; -} - -.ui-body-b .logoLibraryMenuButtonText, .ui-bar-b .logoLibraryMenuButtonText { - color: #fff; -} - .viewMenuBar { font-weight: bold; position: fixed; @@ -310,44 +301,6 @@ } } -.drawerUserPanel { - color: #fff; - padding: 1em 1.2em; - display: flex; - align-items: center; -} - -.drawerUserPanelUserImage { - background-size: contain; - background-repeat: no-repeat; - background-position: center center; - border-radius: 1000px; -} - -.drawerUserPanelUserName { - padding-left: 1em; -} - -.dashboardDocument .lnkMySync { - display: none !important; -} - -.dashboardDocument .dashboardEntryHeaderButton { - display: none !important; -} - -.dashboardDocument .lnkManageServer { - display: none !important; -} - -.dashboardDocument .headerVoiceButton { - display: none !important; -} - -.dashboardDocument .btnCast, .dashboardDocument .headerSelectedPlayer { - display: none !important; -} - body:not(.dashboardDocument) .btnNotifications { display: none !important; } @@ -400,19 +353,6 @@ body:not(.dashboardDocument) .headerAppsButton { display: none; } -.adminDrawer { - background: #fff !important; -} - -.dashboardDocument .mainDrawerPanelContent { - transition: left ease-in-out 0.3s, padding ease-in-out 0.3s; - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; -} - @media all and (min-width: 640px) { .mainDrawerPanel .viewMenuBarTabs { @@ -423,86 +363,4 @@ body:not(.dashboardDocument) .headerAppsButton { .viewMenuBarTabs .libraryViewNav { text-align: left !important; } - - .dashboardDocument .mainDrawer { - z-index: 998 !important; - top: 65px !important; - left: 0 !important; - transform: none !important; - } - - .dashboardDocument .tmla-mask { - display: none !important; - } - - .dashboardDocument .mainDrawerButton { - display: none !important; - } - - .dashboardDocument .libraryMenuButtonText { - font-size: 150%; - } - - .dashboardDocument .mainDrawerPanelContent { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 270px; - } - - .dashboardDocument .adminDrawerLogo { - display: none; - } } - -.adminDrawer .sidebarLink { - color: #333 !important; - font-weight: 400 !important; - padding: .7em 0 .7em 1.5em; -} - -.adminDrawer .sidebarHeader { - color: #666 !important; - font-weight: 500 !important; -} - -.adminDrawer .sidebarLinkIcon { - color: #666; - margin-right: 1em; -} - -.adminDrawer .sidebarLink:hover { - color: #00897B !important; -} - -.adminDrawer .sidebarLink.selectedSidebarLink { - background: #52B54B !important; - color: #fff !important; -} - - .adminDrawer .sidebarLink.selectedSidebarLink .sidebarLinkIcon { - color: #fff !important; - } - -.adminDrawerLogo { - padding: 1.5em 1em 1.2em; - border-bottom: 1px solid #e0e0e0; - margin-bottom: 1em; - display: block; -} - - .adminDrawerLogo img { - height: 30px; - } - -@media all and (max-width: 640px) { - - .dashboardDocument .headerAppsButton { - display: none; - } -} - -.title-separator { - margin: 0 .5em; -} \ No newline at end of file diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index b1a7f274ed..f998afeb7a 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -16,20 +16,6 @@ color: #2E7D32 /*{b-link-active}*/; } -/* latin */ -@font-face { - font-family: 'Montserrat'; - font-style: normal; - font-weight: 400; - src: local('Montserrat-Regular'), url(fonts/Montserrat.woff) format('woff'); - unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; -} - -/* For some reason jquery mobile 1.4.5 wants to horitontally pad mini form fields. */ -.ui-mini { - margin-left: 0; -} - /* Remove IE mobile 300ms tap delay */ html { -ms-touch-action: manipulation; @@ -68,11 +54,6 @@ body { contain: style !important; } -iron-icon { - min-width: 24px; - min-height: 24px; -} - /* Without this, no content will be displayed in mobile safari */ .pageContainer { overflow-x: visible !important; @@ -188,15 +169,6 @@ select { display: block; } -.ui-body-a select { - background: none; - border-color: #757575; -} - - .ui-body-a select option { - color: #000; - } - .ui-body-b select, .ui-body-b [is="emby-input"] { background: none; border-color: #454545; @@ -308,69 +280,17 @@ textarea { } } -.btnCurrentUser { - text-decoration: none; -} - -.currentUsername { - margin-right: 7px; - color: #000; - position: relative; - top: 4px; - display: none; -} - -h1 .imageLink { - margin-left: 15px; -} - - h1 .imageLink img { - height: 32px; - } - -.imageLink:hover { - opacity: .5; -} - .pageTitle { margin-top: 0; font-family: inherit; } -.imageButton { - background: transparent; - border: 0; - padding: 0; - cursor: pointer; - outline: none; - color: inherit; -} - - .imageButton:hover { - opacity: .5; - } - - .imageButton[disabled], .imageButton[disabled]:hover { - opacity: .3 !important; - cursor: default; - } - .fieldDescription { padding-left: 2px; font-weight: normal; white-space: normal !important; } -.paperCheckboxFieldDescription { - padding-left: 31px; - padding-top: 5px; -} - -paper-input + .fieldDescription { - padding-top: 5px; - opacity: .9; -} - .warningFieldDescription { padding: 5px; border: 1px solid #f4c63f; @@ -429,11 +349,6 @@ paper-input + .fieldDescription { font-weight: 500; } -/* Tabs (e.g. advanced metadata page) */ -.localnav { - margin-bottom: 30px !important; -} - .ui-content { border-width: 0; overflow: visible; @@ -446,13 +361,6 @@ paper-input + .fieldDescription { padding-bottom: 160px; } -@media all and (min-width: 450px) { - - .currentUsername { - display: inline; - } -} - @media all and (min-width: 800px) { /* @@ -465,13 +373,6 @@ paper-input + .fieldDescription { .header { padding-bottom: 15px; } - - .type-interior > .ui-content, .type-interior > .ui-panel-content-wrap > .ui-content { - padding-right: 0; - padding-left: 0; - padding-top: 0; - overflow: hidden; - } } @media all and (min-width: 900px) { @@ -481,30 +382,6 @@ paper-input + .fieldDescription { } } -#ulDirectoryPickerList a { - padding-top: .4em; - padding-bottom: .4em; -} - -.lblDirectoryPickerPath { - white-space: nowrap; -} - -.directoryPickerHeadline { - color: #000; - background: #fff3a5; - padding: 1em; - border-radius: 5px; - margin-top: 2em; -} - -.directoryPicker paper-item { - min-height: 36px; - border-bottom: 1px solid #eee; - outline: none; - cursor: pointer; -} - /* Footer */ #footer { position: fixed; @@ -722,25 +599,6 @@ progress { background-color: #e8e8e8; } -.ui-body-a .emby-collapsible-button { - border: 0; - background-color: #e8e8e8; - text-transform: none; -} - -.ui-body-a .emby-collapsible-title { - margin: .25em 0; - color: #000; - padding: 0 0 0 .5em; - font-weight: 500; -} - -.ui-body-a .emby-collapsible-content, .ui-body-a .collapseContent { - border-width: 0; - padding: 1em 1.25em; - background-color: #fff; -} - .ui-body-b .emby-collapsible-button { border: 0; background-color: #333; @@ -758,8 +616,4 @@ progress { border-width: 0; padding: 1em 1.25em; background-color: #222; -} - -#editItemMetadataPage #txtOverview .paper-input-input { - max-height: 90px; -} +} \ No newline at end of file diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 8cc3580682..8e2c8cedb2 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -12,9 +12,9 @@ currentItemId = itemId; if (itemId) { - require(['components/metadataeditor/metadataeditor'], function (metadataeditor) { + require(['metadataEditor'], function (metadataEditor) { - metadataeditor.embed(page.querySelector('.editPageInnerContent'), itemId, ApiClient.serverInfo().Id); + metadataEditor.embed(page.querySelector('.editPageInnerContent'), itemId, ApiClient.serverInfo().Id); }); } else { page.querySelector('.editPageInnerContent').innerHTML = ''; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 29da0fc3bf..8ec7979f93 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -545,8 +545,7 @@ if (page.classList.contains('standalonePage')) { - headerHtml += ''; - headerHtml += 'EMBY'; + headerHtml += ''; } headerHtml += ''; @@ -956,9 +955,9 @@ // The native app can handle a little bit more than safari if (AppInfo.isNativeApp) { - quality -= 5; + quality -= 10; } else { - quality -= 15; + quality -= 20; } } options.quality = quality; @@ -1488,7 +1487,6 @@ var AppInfo = {}; velocity: bowerPath + "/velocity/velocity.min", ironCardList: 'components/ironcardlist/ironcardlist', scrollThreshold: 'components/scrollthreshold', - directorybrowser: 'components/directorybrowser/directorybrowser', playlisteditor: 'components/playlisteditor/playlisteditor', medialibrarycreator: 'components/medialibrarycreator/medialibrarycreator', medialibraryeditor: 'components/medialibraryeditor/medialibraryeditor', @@ -1548,6 +1546,10 @@ var AppInfo = {}; define("libjass", [bowerPath + "/libjass/libjass.min", "css!" + bowerPath + "/libjass/libjass"], returnFirstDependency); + define("directorybrowser", ["components/directorybrowser/directorybrowser"], returnFirstDependency); + define("metadataEditor", [embyWebComponentsBowerPath + "/metadataeditor/metadataeditor"], returnFirstDependency); + define("personEditor", [embyWebComponentsBowerPath + "/metadataeditor/personeditor"], returnFirstDependency); + define("emby-collapse", [embyWebComponentsBowerPath + "/emby-collapse/emby-collapse"], returnFirstDependency); define("emby-button", [embyWebComponentsBowerPath + "/emby-button/emby-button"], returnFirstDependency); define("emby-itemscontainer", [embyWebComponentsBowerPath + "/emby-itemscontainer/emby-itemscontainer"], returnFirstDependency); diff --git a/dashboard-ui/shared.html b/dashboard-ui/shared.html index 6bcd1b4279..fbb091e4f2 100644 --- a/dashboard-ui/shared.html +++ b/dashboard-ui/shared.html @@ -11,7 +11,7 @@ border-bottom-right-radius: 10px; } - +
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 7e8706f54b..df57d57e3b 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -6,7 +6,7 @@ background: #e1f5f3; } -button[is="emby-button"].fab.blue, paper-fab.blue { +button[is="emby-button"].fab.blue { background: #03a9f4; } @@ -135,10 +135,6 @@ button[is="emby-button"].mini:not(.fab) { width: 20px; } -paper-toast { - z-index: 9999999; -} - button[is="emby-button"].notext { min-width: 2.8em; padding-left: .25em !important; @@ -149,69 +145,6 @@ button[is="emby-button"].notext { margin-right: 0; } -paper-icon-button paper-ripple { - color: inherit !important; -} - -.ui-body-b paper-icon-button[disabled] { - color: #444 !important; -} - -paper-fab { - vertical-align: middle; - display: inline-flex !important; -} - - paper-fab.mini { - width: 22px; - height: 22px; - } - - paper-fab.mini iron-icon { - width: 22px; - height: 22px; - } - -.ui-body-a paper-fab.subdued { - background: #fff; - color: #000; -} - - .ui-body-a paper-fab.subdued paper-material.keyboard-focus { - background: #686868 !important; - } - -.ui-body-b paper-fab.subdued { - background: #404040; - color: #fff; -} - - .ui-body-b paper-fab.subdued paper-material.keyboard-focus { - background: #686868 !important; - } - -.ui-body-b paper-fab[disabled].subdued { - background: #222; -} - -paper-fab.white { - background: #fff; - color: #000; -} - - paper-fab.white paper-material.keyboard-focus { - background: #01579b !important; - color: #fff; - } - -paper-fab.square { - border-radius: 5px; -} - -paper-fab.accent { - background-color: #52B54B; -} - .fab.green { background-color: #81c784 !important; } @@ -224,144 +157,14 @@ paper-fab.accent { background-color: #e57373 !important; } -.scrollablePaperTabs paper-icon-button { - display: none !important; -} - -.ui-body-b paper-item-body [secondary] { - color: #aaa; -} - -.ui-body-b paper-checkbox paper-ripple { - color: #fff !important; -} - -.ui-body-b paper-checkbox #checkboxLabel.paper-checkbox { - color: inherit; -} - -.ui-body-a .paperCheckboxFieldDescription { - color: #333; -} - -.ui-body-b .paperCheckboxFieldDescription { +.ui-body-b .paperListLabel, .ui-body-b .fieldDescription, .ui-body-b .selectLabelUnfocused, .ui-body-b .inputLabel, .ui-body-b .textareaLabel { color: #ccc; } -.ui-body-b paper-checkbox #checkbox.paper-checkbox { - border-color: #dedede; -} - -.ui-body-a paper-checkbox #checkbox.checked.paper-checkbox { - background-color: #52B54B; - border-color: #52B54B; -} - -.ui-body-b paper-checkbox #checkbox.checked.paper-checkbox { - background-color: #52B54B; - border-color: #52B54B; -} - -paper-checkbox #checkboxContainer { - width: 22px !important; - height: 22px !important; -} - -paper-checkbox paper-ripple { - top: -13px !important; - left: -13px !important; -} - -paper-checkbox #checkmark { - border-right-width: 4px !important; - border-bottom-width: 4px !important; -} - -.paperCheckboxList paper-checkbox { - display: block; - padding: .5em 0; -} - -paper-input label, paper-textarea label { - font-size: 18px !important; - font-family: inherit !important; -} - -.paperListLabel { - font-size: 16px; - margin-bottom: .5em; -} - -.ui-body-b .paper-input-container-0 .input-content.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-b paper-textarea label, .ui-body-b .paperListLabel, .ui-body-b .fieldDescription { - color: #ccc; -} - -.ui-body-a .inputLabel, .ui-body-a .textareaLabel { - color: #555; -} - - .ui-body-a .inputLabel.focused:not(.blank), .ui-body-a .textareaLabel.focused:not(.blank) { - color: green; - } - -.ui-body-b .selectLabelUnfocused, .ui-body-b .inputLabel, .ui-body-b .textareaLabel { - color: #ccc; -} - -.ui-body-a .paper-input-container-0 .input-content.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.paper-input-container .paper-input-label, .ui-body-a paper-textarea label, .ui-body-a .selectLabel, .ui-body-a .paperListLabel, .ui-body-a .fieldDescription { - color: #555; -} - -.ui-body-a .paper-input-container-0 .input-content.label-is-highlighted.paper-input-container label, .ui-body-a .paper-input-container-0 .input-content.label-is-highlighted.paper-input-container .paper-input-label { - color: green; -} - -.ui-body-b .paper-input-container-0 .input-content.label-is-highlighted.paper-input-container label, .ui-body-b .paper-input-container-0 .input-content.label-is-highlighted.paper-input-container .paper-input-label { - color: #52B54B; -} - -.ui-body-b .paper-input-container-0 .input-content.paper-input-container input, .ui-body-b .paper-input-container-0 .input-content.paper-input-container textarea, .ui-body-b .paper-input-container-0 .input-content.paper-input-container iron-autogrow-textarea, .ui-body-b .paper-input-container-0 .input-content.paper-input-container .paper-input-input { - color: #fff; -} - -paper-input .focused-line, paper-textarea .focused-line { - background-color: #52B54B !important; -} - -.ui-body-b .unfocused-line.paper-input-container, .ui-body-b .unfocused-line.paper-textarea-container { - background: #454545; -} - -paper-textarea.mono textarea { - font-family: monospace !important; -} - -.paperList { - padding: .5em 0; - margin: 12px auto; - 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); - background-color: #fff; -} - -.paperCheckboxList.paperList { - padding: .5em 1em; -} - .ui-body-b .paperList { background-color: #2b2b2b; } -paper-dropdown-menu { - text-align: left; - margin: auto; - width: 100%; - display: inline-block; -} - - paper-dropdown-menu paper-item { - display: block; - } - div.dialogHeader { padding: .35em .5em; display: flex;