diff --git a/dashboard-ui/components/navdrawer/navdrawer.css b/dashboard-ui/components/navdrawer/navdrawer.css index 36d028db1c..8304b729de 100644 --- a/dashboard-ui/components/navdrawer/navdrawer.css +++ b/dashboard-ui/components/navdrawer/navdrawer.css @@ -1,5 +1,4 @@ .touch-menu-la { - width: 260px; position: fixed; top: 0; bottom: 0; diff --git a/dashboard-ui/css/dashboard.css b/dashboard-ui/css/dashboard.css index 272f9abb9f..c7bfeb52b3 100644 --- a/dashboard-ui/css/dashboard.css +++ b/dashboard-ui/css/dashboard.css @@ -116,62 +116,8 @@ progress { 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: inherit !important; - top: 58px !important; - left: 0 !important; - transform: none !important; - } - - .dashboardDocument .tmla-mask { - display: none !important; - } - - .dashboardDocument .mainDrawerButton { - display: none !important; - } - - .dashboardDocument .mainDrawerPanelContent { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 260px; - } - - .dashboardDocument .adminDrawerLogo { - display: none; - } -} - .adminDrawer .sidebarLink { color: #333 !important; - font-weight: 400 !important; - padding: .7em 0 .7em 2em; } .adminDrawer .sidebarHeader { @@ -179,11 +125,6 @@ progress { font-weight: 500 !important; } -.adminDrawer .sidebarLinkIcon { - color: #666; - margin-right: 1em; -} - .adminDrawer .sidebarLink:hover { color: #00897B !important; } @@ -193,10 +134,6 @@ progress { color: #fff !important; } - .adminDrawer .sidebarLink.selectedSidebarLink .sidebarLinkIcon { - color: #fff !important; - } - .adminDrawerLogo { padding: 1.5em 1em 1.2em; border-bottom: 1px solid #e0e0e0; diff --git a/dashboard-ui/css/images/logo.png b/dashboard-ui/css/images/logo.png index a6c51ff23d..7e55e0449d 100644 Binary files a/dashboard-ui/css/images/logo.png and b/dashboard-ui/css/images/logo.png differ diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 8d162b2cf2..6a596a5ab2 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -520,13 +520,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -@media all and (min-width: 800px) { - - .mainDetailButtons, .itemDetailPage .recordingFields button { - font-size: 110%; - } -} - .detailImageProgressContainer { position: absolute; bottom: 4px; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 98bacaa3c3..05e5bfeb92 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -213,6 +213,29 @@ } } +.sidebarLink { + display: block; + text-decoration: none; + color: #111 !important; + font-weight: normal !important; + vertical-align: middle; + padding: 1em 0 1em 2.4em; +} + + .sidebarLink:hover { + background: #f2f2f2; + } + + .sidebarLink.selectedSidebarLink { + background: #f2f2f2 !important; + } + +.sidebarHeader { + padding-left: 1.4em; + margin: 1.2em 0 .7em; + color: #666; +} + body:not(.dashboardDocument) .btnNotifications { display: none !important; } @@ -224,36 +247,26 @@ body:not(.dashboardDocument) .btnNotifications { backdrop-filter: blur(5px);*/ } - .darkDrawer .sidebarLinkIcon { - color: #bbb !important; - margin-left: 1.6em; + .darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink { + color: #fff !important; } -.darkDrawer i.sidebarLinkIcon { - margin-left: 1.9em; -} + .darkDrawer .sidebarHeader { + color: #bbb !important; + } -.darkDrawer .sidebarLinkText, .darkDrawer .sidebarLink { - color: #fff !important; - font-weight: normal !important; -} + .darkDrawer .sidebarDivider { + background: #262626 !important; + } -.darkDrawer .sidebarHeader { - color: #bbb !important; -} + .darkDrawer .sidebarLink:hover { + background: #252528; + } -.darkDrawer .sidebarDivider { - background: #282828 !important; -} - -.darkDrawer .sidebarLink:hover { - background: #252528; -} - -.darkDrawer .sidebarLink.selectedSidebarLink, .darkDrawer .selectedMediaFolder { - background: #252528 !important; - color: #52B54B !important; -} + .darkDrawer .sidebarLink.selectedSidebarLink, .darkDrawer .selectedMediaFolder { + background: #252528 !important; + color: #52B54B !important; + } body:not(.dashboardDocument) .headerAppsButton { display: none; @@ -263,6 +276,15 @@ body:not(.dashboardDocument) .headerAppsButton { padding-bottom: 10vh; } +.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 { @@ -273,4 +295,47 @@ body:not(.dashboardDocument) .headerAppsButton { .viewMenuBarTabs .libraryViewNav { text-align: left !important; } -} \ No newline at end of file + + .dashboardDocument .sidebarLink { + padding: .7em 0 .7em 2.4em; + } + + .dashboardDocument .mainDrawer { + z-index: inherit !important; + left: 0 !important; + top: 0 !important; + transform: none !important; + } + + .dashboardDocument .mainDrawer-scrollContainer { + margin-top: 50px !important; + } + + .dashboardDocument.withTallToolbar .mainDrawer-scrollContainer { + margin-top: 98px !important; + } + + .dashboardDocument .tmla-mask { + display: none !important; + } + + .dashboardDocument .mainDrawerButton { + display: none !important; + } + + .dashboardDocument .mainDrawerPanelContent { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 260px; + } + + .dashboardDocument .adminDrawerLogo { + display: none !important; + } + + .dashboardDocument .darkDrawer { + background-color: rgba(28,28,31,.3) !important; + } +} diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 86b203602c..704d9e4de1 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -211,46 +211,6 @@ div[data-role='page'] { background-color: #f0f0f0; } -.sidebarLinks { - margin-top: 1.5em; - padding-bottom: 50px; -} - -.sidebarLink { - display: block; - padding: .8em 20px .8em 0; - text-decoration: none; - color: #111 !important; - font-weight: 500 !important; - vertical-align: middle; - font-size: 110%; -} - - .sidebarLink:hover { - background: #f2f2f2; - } - - .sidebarLink.selectedSidebarLink { - background: #f2f2f2 !important; - } - -.sidebarLinkIcon { - text-align: center; - vertical-align: middle; - margin-right: 1.2em; -} - - .sidebarLinkIcon + span { - vertical-align: middle; - } - -.sidebarHeader { - padding-left: 20px; - margin: 15px 0 10px; - color: #666; - font-weight: 500; -} - .ui-content { border-width: 0; overflow: visible; diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index 8e261d4202..27c4358021 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -19,7 +19,7 @@
-
+
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js index c4f8726e36..23c2c3cd24 100644 --- a/dashboard-ui/scripts/itembynamedetailpage.js +++ b/dashboard-ui/scripts/itembynamedetailpage.js @@ -269,7 +269,7 @@ IncludeItemTypes: "Audio", PersonTypes: "", ArtistIds: "", - Limit: 30 + Limit: 40 }, { playFromHere: true, action: 'playallfromhere', diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 364bd9f7db..e91a2511ca 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -1,4 +1,4 @@ -define(['layoutManager', 'viewManager', 'libraryBrowser', 'embyRouter', 'playbackManager', 'paper-icon-button-light', 'material-icons'], function (layoutManager, viewManager, libraryBrowser, embyRouter, playbackManager) { +define(['layoutManager', 'viewManager', 'libraryBrowser', 'embyRouter', 'playbackManager', 'paper-icon-button-light', 'material-icons', 'scrollStyles'], function (layoutManager, viewManager, libraryBrowser, embyRouter, playbackManager) { 'use strict'; var enableBottomTabs = AppInfo.isNativeApp; @@ -290,12 +290,9 @@ var homeHref = window.ApiClient ? 'home.html' : 'selectserver.html?showuser=1'; - html += ''; - html += '
'; - html += Globalize.translate('ButtonHome'); - html += ''; + html += '' + Globalize.translate('ButtonHome') + ''; - html += 'tablet_android' + Globalize.translate('ButtonRemote') + ''; + html += '' + Globalize.translate('ButtonRemote') + ''; html += '
'; @@ -312,11 +309,11 @@ html += Globalize.translate('HeaderAdmin'); html += '
'; - html += 'dashboard' + Globalize.translate('ButtonManageServer') + ''; - html += 'mode_edit' + Globalize.translate('MetadataManager') + ''; + html += '' + Globalize.translate('ButtonManageServer') + ''; + html += '' + Globalize.translate('MetadataManager') + ''; if (!browserInfo.mobile) { - html += 'insert_chart' + Globalize.translate('ButtonReports') + ''; + html += '' + Globalize.translate('ButtonReports') + ''; } html += '
'; } @@ -326,19 +323,19 @@ html += '
'; if (user.localUser && (AppInfo.isNativeApp && browserInfo.android)) { - html += 'settings' + Globalize.translate('ButtonSettings') + ''; + html += '' + Globalize.translate('ButtonSettings') + ''; } - html += 'file_download' + Globalize.translate('ManageOfflineDownloads') + ''; + html += '' + Globalize.translate('ManageOfflineDownloads') + ''; - html += 'sync' + Globalize.translate('SyncToOtherDevices') + ''; + html += '' + Globalize.translate('SyncToOtherDevices') + ''; if (Dashboard.isConnectMode()) { - html += 'wifi' + Globalize.translate('ButtonSelectServer') + ''; + html += '' + Globalize.translate('ButtonSelectServer') + ''; } if (user.localUser) { - html += 'lock' + Globalize.translate('ButtonSignOut') + ''; + html += '' + Globalize.translate('ButtonSignOut') + ''; } html += ''; @@ -558,7 +555,7 @@ icon = i.icon || icon; var onclick = i.onclick ? ' function(){' + i.onclick + '}' : 'null'; - return '' + icon + '' + i.Name + ''; + return '' + i.Name + ''; }).join(''); @@ -851,6 +848,12 @@ if (!page.classList.contains('withTabs')) { LibraryMenu.setTabs(null); + + if (page.classList.contains('pageWithAbsoluteTabs')) { + document.body.classList.add('withTallToolbar'); + } else { + document.body.classList.remove('withTallToolbar'); + } } }); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a9f55e4c98..755f2a7fe4 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -383,14 +383,6 @@ var Dashboard = { pageIds = pageIds ? (' data-pageids="' + pageIds + '"') : ''; menuHtml += ''; - var icon = item.icon; - - if (icon) { - var style = item.color ? ' style="color:' + item.color + '"' : ''; - - menuHtml += '' + icon + ''; - } - menuHtml += ''; menuHtml += item.name; menuHtml += '';