diff --git a/dashboard-ui/components/servertestermessage.js b/dashboard-ui/components/servertestermessage.js index 5da2d9cded..c65fcab7fd 100644 --- a/dashboard-ui/components/servertestermessage.js +++ b/dashboard-ui/components/servertestermessage.js @@ -132,7 +132,7 @@ var key = 'servertestermessagetime'; var lastShown = parseInt(appSettings.get(key) || '0'); - if ((new Date().getTime() - lastShown) < 259200000) { + if ((new Date().getTime() - lastShown) < 172800000) { return; } diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index fe89952cb9..fa7d0e96a6 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -166,6 +166,7 @@ -ms-overflow-style: none; overflow: -moz-scrollbars-none; -webkit-overflow-scrolling: touch; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2); } .libraryViewNav::-webkit-scrollbar { diff --git a/dashboard-ui/devices/android/android.css b/dashboard-ui/devices/android/android.css index f36baba19e..f97bc7a3f5 100644 --- a/dashboard-ui/devices/android/android.css +++ b/dashboard-ui/devices/android/android.css @@ -1,7 +1,3 @@ -.libraryViewNav { - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2); +.libraryViewNav a, paper-tab, paper-tab a { + font-weight: bold !important; } - - .libraryViewNav a, paper-tab { - font-weight: 500 !important; - } \ No newline at end of file diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css index 4b7be64d5a..d119d36ceb 100644 --- a/dashboard-ui/devices/ios/ios.css +++ b/dashboard-ui/devices/ios/ios.css @@ -44,6 +44,10 @@ background-color: #000; } +.libraryViewNav { + box-shadow: none; +} + .libraryViewNav a { font-weight: 400; text-transform: none; diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index 55b34b4763..cdb274201b 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -1,4 +1,4 @@ -define(['imageLoader', 'jQuery', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader, $) { +define(['imageLoader', 'layoutManager', 'jQuery', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader, layoutManager, $) { var mainDrawerPanel = document.querySelector('.mainDrawerPanel'); @@ -933,7 +933,7 @@ viewMenuBar.classList.remove('hide'); } - if (page.classList.contains('type-interior')) { + if (page.classList.contains('type-interior') && !layoutManager.mobile) { viewMenuBar.classList.add('headroomDisabled'); } else { viewMenuBar.classList.remove('headroomDisabled'); diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index bafb00ec5a..bfc3f02236 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -980,7 +980,7 @@ // Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts // This will start the transcoding process before actually feeding the video url into the player // Edit: Also seeing stalls from hls.js - if ((browserInfo.safari || browserInfo.msie || browserInfo.firefox) && !mediaSource.RunTimeTicks && isHls) { + if (!mediaSource.RunTimeTicks && isHls) { Dashboard.showLoadingMsg(); var hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8'); @@ -992,7 +992,12 @@ }).then(function () { Dashboard.hideLoadingMsg(); streamInfo.url = hlsPlaylistUrl; - self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback); + + // add a delay to continue building up the buffer. without this we see failures in safari mobile + setTimeout(function () { + self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback); + }, 2000); + }, function () { Dashboard.hideLoadingMsg(); }); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b7cb264c03..821af32803 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -2923,8 +2923,6 @@ var AppInfo = {}; deps.push('css!devices/ios/ios.css'); } else if (AppInfo.isNativeApp && browserInfo.edge) { deps.push('css!devices/windowsphone/wp.css'); - } else if (!browserInfo.android) { - deps.push('css!devices/android/android.css'); } loadTheme();