diff --git a/src/assets/css/librarybrowser.css b/src/assets/css/librarybrowser.css index f0865815f2..2b78d356dc 100644 --- a/src/assets/css/librarybrowser.css +++ b/src/assets/css/librarybrowser.css @@ -21,7 +21,7 @@ } .libraryPage { - padding-top: 7em; + padding-top: 7em !important; } .itemDetailPage { @@ -115,7 +115,7 @@ display: -webkit-inline-box; display: -webkit-inline-flex; display: inline-flex; - margin: 0 0 0 0.5em; + margin: 0.3em 0 0 0.5em; height: 1.7em; -webkit-box-align: center; -webkit-align-items: center; @@ -128,10 +128,6 @@ margin-top: 0; } -.layout-mobile .pageTitleWithDefaultLogo { - background-image: url(../img/icon-transparent.png); -} - .headerLeft, .skinHeader { display: -webkit-box; @@ -242,10 +238,11 @@ } .mainDrawer-scrollContainer { - margin-bottom: 10vh; + padding-bottom: 10vh; } @media all and (min-width: 40em) { + .dashboardDocument .adminDrawerLogo, .dashboardDocument .mainDrawerButton { display: none !important; } @@ -271,6 +268,12 @@ } } +@media all and (max-width: 60em) { + .libraryDocument .mainDrawerButton { + display: none; + } +} + @media all and (max-width: 84em) { .withSectionTabs .headerTop { padding-bottom: 0.55em; @@ -313,7 +316,7 @@ } .dashboardDocument .mainDrawer-scrollContainer { - margin-top: 4.6em !important; + margin-top: 4.65em !important; } } @@ -606,12 +609,11 @@ } .detailLogo { - width: 67.25vw; - height: 14.5vh; + width: 30vw; + height: 25vh; position: absolute; - top: 15vh; - right: 0; - -webkit-background-size: contain; + top: 10vh; + right: 20vw; background-size: contain; } @@ -619,26 +621,8 @@ display: none; } -@media all and (max-width: 87.5em) { - .detailLogo { - right: 5%; - } -} - -@media all and (max-width: 75em) { - .detailLogo { - right: 2%; - } -} - @media all and (max-width: 68.75em) { .detailLogo { - width: 14.91em; - height: 3.5em; - right: 5%; - bottom: 5%; - top: auto; - background-position: center right; display: none; } } @@ -1119,50 +1103,3 @@ div:not(.sectionTitleContainer-cards) > .sectionTitle-cards { .itemsViewSettingsContainer > .button-flat { margin: 0; } - -.layout-mobile #myPreferencesMenuPage { - padding-top: 3.75em; -} - -.itemDetailsGroup { - margin-bottom: 1.5em; -} - -.trackSelections { - max-width: 44em; -} - -.detailsGroupItem, -.trackSelections .selectContainer { - display: flex; - max-width: 44em; - margin: 0 0 0.5em !important; -} - -.trackSelections .selectContainer { - margin: 0 0 0.3em !important; -} - -.detailsGroupItem .label, -.trackSelections .selectContainer .selectLabel { - cursor: default; - flex-grow: 0; - flex-shrink: 0; - flex-basis: 6.25em; - margin: 0 0.6em 0 0; -} - -.trackSelections .selectContainer .selectLabel { - margin: 0 0.2em 0 0; -} - -.trackSelections .selectContainer .detailTrackSelect { - font-size: inherit; - padding: 0; - overflow: hidden; -} - -.trackSelections .selectContainer .selectArrowContainer .selectArrow { - margin-top: 0; - font-size: 1.4em; -} diff --git a/src/components/filedownloader.js b/src/components/filedownloader.js index a8b45ab106..6f1bd3ff2a 100644 --- a/src/components/filedownloader.js +++ b/src/components/filedownloader.js @@ -4,7 +4,7 @@ export function download(items) { if (window.NativeShell) { items.map(function (item) { - window.NativeShell.downloadFile(item.url); + window.NativeShell.downloadFile(item); }); } else { multiDownload(items.map(function (item) { diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js index a00baaa6f0..d6497e5f09 100644 --- a/src/components/guide/guide.js +++ b/src/components/guide/guide.js @@ -1,4 +1,4 @@ -define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'registerElement'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) { +define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', 'scrollHelper', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'playbackManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'dom', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-programcell', 'emby-button', 'paper-icon-button-light', 'emby-tabs', 'emby-scroller', 'flexStyles', 'registerElement'], function (require, inputManager, browser, globalize, connectionManager, scrollHelper, serverNotifications, loading, datetime, focusManager, playbackManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, dom) { 'use strict'; function showViewSettings(instance) { @@ -1252,18 +1252,5 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager', }); } - var ProgramCellPrototype = Object.create(HTMLButtonElement.prototype); - - ProgramCellPrototype.detachedCallback = function () { - this.posLeft = null; - this.posWidth = null; - this.guideProgramName = null; - }; - - document.registerElement('emby-programcell', { - prototype: ProgramCellPrototype, - extends: 'button' - }); - return Guide; }); diff --git a/src/components/homescreensettings/homescreensettings.template.html b/src/components/homescreensettings/homescreensettings.template.html index d5bae685b8..8515f3f0ad 100644 --- a/src/components/homescreensettings/homescreensettings.template.html +++ b/src/components/homescreensettings/homescreensettings.template.html @@ -10,6 +10,13 @@