diff --git a/dashboard-ui/components/dockedtabs/dockedtabs.js b/dashboard-ui/components/dockedtabs/dockedtabs.js index 9e279dd041..b0a0a2d942 100644 --- a/dashboard-ui/components/dockedtabs/dockedtabs.js +++ b/dashboard-ui/components/dockedtabs/dockedtabs.js @@ -220,7 +220,7 @@ \ live_tv' + globalize.translate('HeaderLiveTV') + '\ \ - \ + \ favorite' + globalize.translate('TabFavorites') + '\ \ '; diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index fd8f8be30e..f969f93e23 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -957,10 +957,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } } -.homeFavoritesDisabled .homeFavoritesTab { - display: none !important; -} - #criticReviewsContent.hiddenScrollX { white-space: nowrap; } diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 90fc847130..27d7efb341 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -87,6 +87,9 @@ align-items: center; margin-left: .75em; font-size: 108%; + + /* Avoid pushing right header off the screen */ + flex-shrink: 1; } .viewMenuBar { diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index 31d8fbb406..150d755261 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -102,12 +102,12 @@ } .nowPlayingImage img { - height: 56px; + height: 64px; } .nowPlayingBar .nowPlayingImage { - width: 56px; - height: 56px; + width: 64px; + height: 64px; background-position: center center; background-repeat: no-repeat; background-size: contain; @@ -161,7 +161,7 @@ .nowPlayingBarCenter { vertical-align: middle; text-align: center; - margin-top: 3px; + margin-top: 6px; /* Need this to make sure it's on top of nowPlayingBarPositionContainer so that buttons are fully clickable */ z-index: 2; position: absolute; @@ -172,7 +172,7 @@ .nowPlayingBarPositionContainer { position: absolute !important; - left: 56px; + left: 64px; top: -8px; right: 0; z-index: 1; diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css index 57fc14cbc6..d81919f299 100644 --- a/dashboard-ui/devices/ios/ios.css +++ b/dashboard-ui/devices/ios/ios.css @@ -23,24 +23,11 @@ body:not(.dashboardDocument) .mainDrawerButton { background-attachment: initial; } -.background-theme-b .backgroundContainer:not(.withBackdrop), .dialog.background-theme-b { - background: #181818; -} - .viewMenuBar { /* It needs this in order to retain height since we're positioning the contents absolutely */ height: 50px; } -.libraryDocument .viewMenuBar, .libraryViewNav { - background-color: #000 !important; - box-shadow: none !important; -} - -.viewMenuBar.semiTransparent { - background-color: #000; -} - .emby-tab-button { font-weight: 400; text-transform: none !important; @@ -56,14 +43,6 @@ body:not(.dashboardDocument) .mainDrawerButton { display: none; } -@media all and (max-width: 600px) { - - .libraryViewNav a { - padding-left: 10px; - padding-right: 10px; - } -} - .libraryViewNav { font-size: 12px; } @@ -92,10 +71,6 @@ h1, h1 a { font-weight: 400 !important; } -.nowPlayingPageBackButton { - display: none !important; -} - .nowPlayingPage .libraryViewNav { top: 0 !important; } diff --git a/dashboard-ui/home.html b/dashboard-ui/home.html index 3a4ba42255..a2ab71f40e 100644 --- a/dashboard-ui/home.html +++ b/dashboard-ui/home.html @@ -8,7 +8,7 @@ ${TabNextUp} - + ${TabFavorites} diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html index 102215d77a..e6d356b09c 100644 --- a/dashboard-ui/livetv.html +++ b/dashboard-ui/livetv.html @@ -8,7 +8,7 @@ ${TabGuide} - + ${TabChannels} diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 37a98da913..2699b2685c 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -8,7 +8,7 @@ ${TabMovies} - + ${TabTrailers} diff --git a/dashboard-ui/music.html b/dashboard-ui/music.html index d372d3cf4c..1d7b21773f 100644 --- a/dashboard-ui/music.html +++ b/dashboard-ui/music.html @@ -8,7 +8,7 @@ ${TabAlbums} - + ${TabAlbumArtists} diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index c4789b0bbf..b6fcd07de4 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -102,7 +102,7 @@ LibraryBrowser.renderName(item, page.querySelector('.itemName'), false, context); LibraryBrowser.renderParentName(item, page.querySelector('.parentName'), context); - LibraryMenu.setTitle(item.SeriesName || item.Name); + LibraryMenu.setTitle(''); Dashboard.getCurrentUser().then(function (user) { diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index cabf0d1dab..0179043e3b 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -366,9 +366,7 @@ var secondaryTitle = (link.innerText || link.textContent).trim(); title += secondaryTitle; - var documentTitle = secondaryTitle; - - LibraryMenu.setTitle(title, documentTitle); + LibraryMenu.setTitle(title); } else { link.classList.remove('selectedSidebarLink'); @@ -698,7 +696,7 @@ libraryMenuButtonText.innerHTML = html; } - document.title = title; + document.title = title || 'Emby'; }, setTransparentMenu: function (transparent) { diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 683b098067..fc3b7f843b 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -882,7 +882,6 @@ var AppInfo = {}; var isCordova = Dashboard.isRunningInCordova(); - AppInfo.enableHomeFavorites = true; AppInfo.enableHomeTabs = true; AppInfo.enableNowPlayingPageBottomTabs = true; AppInfo.enableAutoSave = browserInfo.touch; @@ -898,8 +897,6 @@ var AppInfo = {}; AppInfo.hasLowImageBandwidth = true; if (isCordova) { - //AppInfo.enableSectionTransitions = true; - AppInfo.enableHomeFavorites = false; AppInfo.enableNowPlayingPageBottomTabs = false; } } @@ -1059,10 +1056,6 @@ var AppInfo = {}; if (!AppInfo.enableSupporterMembership) { elem.classList.add('supporterMembershipDisabled'); } - - if (!AppInfo.enableHomeFavorites) { - elem.classList.add('homeFavoritesDisabled'); - } } function loadTheme() {