diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index c8b0698f45..9afb8f44b6 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -170,7 +170,7 @@ background: rgba(0, 0, 0, .75); left: 0; color: #eee; - padding: 5px 0 0 0; + padding: 6px 0 2px 0; max-width: 100%; } diff --git a/dashboard-ui/css/chromecast.css b/dashboard-ui/css/chromecast.css index 4cfb5db89b..a634670e00 100644 --- a/dashboard-ui/css/chromecast.css +++ b/dashboard-ui/css/chromecast.css @@ -3,7 +3,7 @@ background-size: 100%; background-repeat: no-repeat; background-position: center center; - width: 26px; + width: 28px; height: 100%; display: inline-block; vertical-align: middle; @@ -31,6 +31,8 @@ .btnCast { white-space: nowrap; + position: relative; + top: 1px !important; } .headerSelectedPlayer { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 990ea56318..620bef0963 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -13,15 +13,22 @@ } .headerBackButton { - padding-right: 0 !important; + padding-right: 5px !important; } -.viewMenuBar, .barsMenuButton, .libraryMenuButtonText, .btnCast { +.headerButton { height: 50px; + line-height: 50px; + display: inline-block; } -.barsMenuButton, .libraryMenuButtonText, .btnCast { - line-height: 50px; +.headerUserImage { + background-size: contain; + background-repeat: no-repeat; + background-position: center center; + border-radius: 1000px; + vertical-align: middle; + display: inline-block; } .viewMenuBar .fa { @@ -32,7 +39,6 @@ .headerButton { margin: 0; - padding: 0; background-color: transparent; top: 0; bottom: 0; @@ -57,10 +63,6 @@ padding: 0 15px; } - .headerButtonLeft:first-child { - padding-left: 10px; - } - .menuArrow { background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAbklEQ…yGDxkLaBtENI9kPMk0gaoW0Dyj0aWowFLYNYzWB6MWMAAAq1H3+Mhu2hQAAAAASUVORK5CYII=); height: 24px; diff --git a/dashboard-ui/css/notifications.css b/dashboard-ui/css/notifications.css index 877b3d0b89..edb74c4cf3 100644 --- a/dashboard-ui/css/notifications.css +++ b/dashboard-ui/css/notifications.css @@ -6,7 +6,7 @@ text-decoration: none !important; vertical-align: middle; border-radius: 1000px; - padding: 5px 10px; + padding: 6px 10px 5px; text-align: center; text-decoration: none !important; -moz-user-select: none; @@ -15,6 +15,7 @@ color: #fff; font-size: 13px; font-weight: normal; + display: inline; } .levelNormal { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 60c258b100..0a4415dc1e 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -532,7 +532,7 @@ var href = card.href || LibraryBrowser.getHref(item, context); var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '' + item.Name + ''); - html += '

' + header + '

'; + html += '

' + header + '

'; html += '
'; @@ -546,64 +546,7 @@ }); html += '
'; - //html += 'Close'; - //html += '
'; - //html += ''; - - //html += '
'; - //html += ''; - //html += '
'; - - //html += '
'; html += ''; $($.mobile.activePage).append(html); diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index f50015d7eb..f41efca273 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -5,7 +5,7 @@ var html = '
'; if (($.browser.safari && window.navigator.standalone) || Dashboard.isRunningInCordova()) { - html += '
'; + html += ''; } html += ''; } if (user.canManageServer) { diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js index 9d8ed7975d..196c5f6720 100644 --- a/dashboard-ui/scripts/notifications.js +++ b/dashboard-ui/scripts/notifications.js @@ -220,7 +220,7 @@ $(document).on('headercreated', function (e) { if (ConnectionManager.currentApiClient()) { - $('
0
').insertAfter($('.headerSearchButton')).on('click', Notifications.showNotificationsFlyout); + $('').insertAfter($('.headerSearchButton')).on('click', Notifications.showNotificationsFlyout); Notifications.updateNotificationCount(); } diff --git a/dashboard-ui/thirdparty/browser.js b/dashboard-ui/thirdparty/browser.js index 061a499273..897738f7e5 100644 --- a/dashboard-ui/thirdparty/browser.js +++ b/dashboard-ui/thirdparty/browser.js @@ -909,6 +909,7 @@ var match = /(chrome)[ \/]([\w.]+)/.exec(ua) || /(safari)[ \/]([\w.]+)/.exec(ua) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || + /(webkit)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || /(msie) ([\w.]+)/.exec(ua) || ua.indexOf("compatible") < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || []; @@ -944,6 +945,10 @@ browser[matched.platform] = true; } + if (browser.webkit && !browser.chrome) { + browser.safari = true; + } + // Chrome is Webkit, but Webkit is also Safari. if (browser.chrome || browser.safari) { browser.webkit = true;