From b1676387f49dddc8b1b3c10f66fdc09ac907929f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti
Date: Wed, 24 Jun 2015 00:38:46 -0400
Subject: [PATCH] update icons
---
dashboard-ui/connectlogin.html | 1 -
dashboard-ui/css/chromecast.css | 28 ++---------
dashboard-ui/css/librarymenu.css | 18 ++-----
dashboard-ui/css/mediaplayer.css | 31 +++++++++---
dashboard-ui/css/search.css | 4 +-
dashboard-ui/css/site.css | 19 -------
dashboard-ui/scripts/actionsheet.js | 9 +++-
dashboard-ui/scripts/librarybrowser.js | 21 ++++----
dashboard-ui/scripts/librarylist.js | 10 ++--
dashboard-ui/scripts/librarymenu.js | 49 +++++++++++++------
dashboard-ui/scripts/nowplayingbar.js | 20 ++++----
dashboard-ui/scripts/pluginspage.js | 6 +--
dashboard-ui/scripts/selectserver.js | 8 +--
dashboard-ui/scripts/syncactivity.js | 6 +--
dashboard-ui/scripts/userprofilespage.js | 6 +--
dashboard-ui/selectserver.html | 2 +-
dashboard-ui/thirdparty/emby-icons.html | 15 +++++-
.../thirdparty/paper-button-style.css | 12 +++++
dashboard-ui/vulcanize-out.html | 15 +++++-
19 files changed, 154 insertions(+), 126 deletions(-)
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index a40912342a..a17f54b507 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -32,7 +32,6 @@
-
${ButtonSkip}
${TextConnectToServerManually}
diff --git a/dashboard-ui/css/chromecast.css b/dashboard-ui/css/chromecast.css
index 2997857f25..b9c1fbc12b 100644
--- a/dashboard-ui/css/chromecast.css
+++ b/dashboard-ui/css/chromecast.css
@@ -1,41 +1,21 @@
-.btnDefaultCast .btnCastImageActive {
- display: none;
-}
-
-.btnActiveCast .btnCastImageDefault {
- display: none;
-}
-
-.btnActiveCast i {
+.btnActiveCast {
color: #2ad !important;
}
-.btnDisabledCast .btnCastImageActive {
- display: none;
-}
-
-.btnDisabledCast i {
- color: #555;
-}
-
.headerSelectedPlayer {
display: inline-block;
vertical-align: middle;
color: #ddd;
- font-size: 11px;
- margin-right: .5em;
+ /*font-size: 11px;*/
+ font-weight: 400;
position: relative;
- top: 1px;
+ top: 2px;
max-width: 100px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
-.btnCastIcon .headerSelectedPlayer {
- top: 0;
-}
-
@media all and (max-width: 600px) {
.headerSelectedPlayer {
display: none;
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index e0db1eac52..6025a20d8a 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -12,10 +12,6 @@
margin: .5em 0;
}
-.headerBackButton {
- padding-right: 5px !important;
-}
-
.headerButton {
height: 50px;
line-height: 50px;
@@ -32,8 +28,7 @@
}
.viewMenuBar .material-icons, .viewMenuBar .fa, .viewMenuBar paper-icon-button {
- color: #e8e8e8;
- font-size: 24px;
+ color: #f0f0f0;
vertical-align: middle;
}
@@ -125,18 +120,10 @@
border-width: 0 !important;
}
-.mainDrawerButton {
- padding-left: 10px !important;
-}
-
.hideMainDrawer .mainDrawerButton {
display: none;
}
-.barMenuInner {
- padding: 6px 10px;
-}
-
.barsMenuButton:hover {
opacity: .5 !important;
}
@@ -149,8 +136,9 @@
display: inline-block;
vertical-align: middle;
padding-left: 0 !important;
- margin-left: -8px;
cursor: default;
+ position: relative;
+ top: 1px;
}
.logoLibraryMenuButtonText {
diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css
index 0d1357c271..6bc4ee80f9 100644
--- a/dashboard-ui/css/mediaplayer.css
+++ b/dashboard-ui/css/mediaplayer.css
@@ -1,6 +1,6 @@
/* Now playing bar */
.nowPlayingBar {
- padding: 0;
+ padding: 8px 0;
border-top: 1px solid #444;
text-align: center;
}
@@ -11,16 +11,30 @@
.mediaButton, .nowPlayingBarUserDataButtons .btnUserItemRating {
vertical-align: middle;
- font-size: 30px;
color: #e8e8e8;
margin: 0;
- padding: 16px 12px;
- min-width: 30px;
text-align: center;
}
+ .mediaButton:not(paper-icon-button) {
+ padding: 16px 12px;
+ }
+
+paper-icon-button.mediaButton {
+ padding: 4px;
+}
+
+.mediaButton iron-icon {
+ height: 48px;
+ width: 48px;
+}
+
+.mediaButton.remoteControlButton iron-icon {
+ height: 30px;
+}
+
.videoTopControls .mediaButton {
- font-size: 26px;
+ font-size: 27px;
}
.videoControls .mediaButton {
@@ -75,7 +89,7 @@
}
.nowPlayingImage img {
- height: 50px;
+ height: 60px;
margin-right: .5em;
vertical-align: bottom;
}
@@ -171,6 +185,11 @@ input[type="range"]::-ms-fill-upper {
padding-top: 0;
}
+ .remoteControlButton {
+ position: relative;
+ top: 4px;
+ }
+
.nowPlayingBar .currentTime, .nowPlayingBar .positionSliderContainer, .nowPlayingBar .volumeSliderContainer, #nowPlayingBar .muteButton, #nowPlayingBar .unmuteButton {
display: none !important;
}
diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css
index 3d4d1fbb87..a92da8ca01 100644
--- a/dashboard-ui/css/search.css
+++ b/dashboard-ui/css/search.css
@@ -196,6 +196,6 @@
}
.btnCloseSearch {
- padding: 0 5px;
- outline: 0;
+ padding-top: 0;
+ padding-bottom: 0;
}
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index bc56565afb..d0d9e07b16 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -994,34 +994,15 @@ progress {
/* Detail Page*/
.btnUserItemRating {
- margin-right: .85em;
- cursor: pointer;
vertical-align: middle;
color: #aaa;
- font-size: 17px;
- width: auto !important;
display: inline-block !important;
- background: none !important;
- border: 0 !important;
- outline: 0 !important;
}
- .btnUserItemRating div {
- border: 0;
- }
-
.btnUserItemRatingOn {
color: #cc3333 !important;
}
-.btnUserItemRating:last-child {
- margin-right: 0;
-}
-
-.btnUserItemRating:hover {
- opacity: .5;
-}
-
.imgUserItemRating {
height: 16px;
width: 16px;
diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js
index cc2d0082ab..4d6f795d1c 100644
--- a/dashboard-ui/scripts/actionsheet.js
+++ b/dashboard-ui/scripts/actionsheet.js
@@ -19,7 +19,7 @@
// If the window height is under a certain amount, don't bother trying to position
// based on an element.
- if (options.positionTo && windowHeight > 600) {
+ if (options.positionTo && windowHeight >= 540) {
var pos = $(options.positionTo).offset();
@@ -93,6 +93,13 @@
setTimeout(function () {
var dlg = document.getElementById(id);
+
+ if (options.visibleBackground) {
+ $(dlg).on('iron-overlay-opened', function(e) {
+ $('iron-overlay-backdrop').addClass('visibleBackground');
+ });
+ }
+
dlg.open();
// Has to be assigned a z-index after the call to .open()
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 0bc2e8c935..e0437e55ba 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2291,6 +2291,7 @@
getUserDataButtonHtml: function (method, itemId, btnCssClass, icon, tooltip) {
+ return ' ';
btnCssClass += " imageButton";
return ' ';
@@ -2311,9 +2312,9 @@
if ((item.MediaType || item.IsFolder) && type != "TvChannel" && type != "MusicArtist" && item.MediaType != "Audio") {
if (userData.Played) {
- html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating btnUserItemRatingOn', 'fa-check', tooltipPlayed);
+ html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating btnUserItemRatingOn', 'check', tooltipPlayed);
} else {
- html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating', 'fa-check', tooltipPlayed);
+ html += LibraryBrowser.getUserDataButtonHtml('markPlayed', itemId, 'btnUserItemRating', 'check', tooltipPlayed);
}
}
}
@@ -2322,24 +2323,24 @@
var tooltipDislike = Globalize.translate('TooltipDislike');
if (typeof userData.Likes == "undefined") {
- html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'fa-thumbs-down', tooltipDislike);
- html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'fa-thumbs-up', tooltipLike);
+ html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike);
+ html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike);
}
else if (userData.Likes) {
- html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'fa-thumbs-down', tooltipDislike);
- html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'fa-thumbs-up', tooltipLike);
+ html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating', 'thumb-down', tooltipDislike);
+ html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-up', tooltipLike);
}
else {
- html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'fa-thumbs-down', tooltipDislike);
- html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'fa-thumbs-up', tooltipLike);
+ html += LibraryBrowser.getUserDataButtonHtml('markDislike', itemId, 'btnUserItemRating btnUserItemRatingOn', 'thumb-down', tooltipDislike);
+ html += LibraryBrowser.getUserDataButtonHtml('markLike', itemId, 'btnUserItemRating', 'thumb-up', tooltipLike);
}
var tooltipFavorite = Globalize.translate('TooltipFavorite');
if (userData.IsFavorite) {
- html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating btnUserItemRatingOn', 'fa-heart', tooltipFavorite);
+ html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating btnUserItemRatingOn', 'favorite', tooltipFavorite);
} else {
- html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating', 'fa-heart', tooltipFavorite);
+ html += LibraryBrowser.getUserDataButtonHtml('markFavorite', itemId, 'btnUserItemRating', 'favorite', tooltipFavorite);
}
return html;
diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js
index 7c7aba19f7..51e407e1fe 100644
--- a/dashboard-ui/scripts/librarylist.js
+++ b/dashboard-ui/scripts/librarylist.js
@@ -863,11 +863,11 @@
.off('.latestgroupings')
.on('click.latestgroupings', '.groupedCard', onGroupedCardClick)
.off('.dotmenu')
- .on('click.dotmenu', '.listviewMenuButton', onListViewMenuButtonClick)
- .off('.cardHoverMenu')
- .on('mouseenter.cardHoverMenu', '.card:not(.bannerCard)', onHoverIn)
- .on('mouseleave.cardHoverMenu', '.card:not(.bannerCard)', onHoverOut)
- .on("touchstart.cardHoverMenu", '.card:not(.bannerCard)', preventTouchHover);
+ .on('click.dotmenu', '.listviewMenuButton', onListViewMenuButtonClick);
+
+ if (!AppInfo.isTouchPreferred) {
+ this.off('.cardHoverMenu').on('mouseenter.cardHoverMenu', '.card:not(.bannerCard)', onHoverIn).on('mouseleave.cardHoverMenu', '.card:not(.bannerCard)', onHoverOut).on("touchstart.cardHoverMenu", '.card:not(.bannerCard)', preventTouchHover);
+ }
this.off('.mediaDetails').on('click.mediaDetails', '.mediaItem', onCardClick);
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index 4ed22aad22..90e9ba8d77 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -8,30 +8,28 @@
var html = '';
@@ -515,6 +518,20 @@
}, 300);
}
+ return false;
+ },
+
+ onLogoutClicked: function () {
+ // There doesn't seem to be a way to detect if the drawer is in the process of opening, so try to handle that here
+ if ((new Date().getTime() - lastOpenTime) > 200) {
+
+ closeMainDrawer();
+
+ setTimeout(function () {
+ Dashboard.logout();
+ }, 300);
+ }
+
return false;
}
};
@@ -525,12 +542,16 @@
if (info.isLocalPlayer) {
- $('.btnCast').addClass('btnDefaultCast').removeClass('btnActiveCast');
+ $('.btnCast').removeClass('btnActiveCast').each(function () {
+ this.icon = 'cast';
+ });
$('.headerSelectedPlayer').html('');
} else {
- $('.btnCast').removeClass('btnDefaultCast').addClass('btnActiveCast');
+ $('.btnCast').addClass('btnActiveCast').each(function () {
+ this.icon = 'cast-connected';
+ });
$('.headerSelectedPlayer').html((info.deviceName || info.name));
}
diff --git a/dashboard-ui/scripts/nowplayingbar.js b/dashboard-ui/scripts/nowplayingbar.js
index 9cca4e8585..a859130a74 100644
--- a/dashboard-ui/scripts/nowplayingbar.js
+++ b/dashboard-ui/scripts/nowplayingbar.js
@@ -29,17 +29,17 @@
html += '
';
// The onclicks are needed due to the return false above
- html += ' ';
- html += ' ';
+ html += ' ';
+ html += ' ';
- html += ' ';
+ html += ' ';
- html += ' ';
- html += ' ';
+ html += ' ';
+ html += ' ';
- html += ' ';
+ html += ' ';
- html += ' ';
+ html += ' ';
html += '
';
@@ -48,8 +48,8 @@
html += '';
html += '
';
- html += ' ';
- html += ' ';
+ html += ' ';
+ html += ' ';
html += '';
html += ' ';
@@ -334,7 +334,7 @@
nowPlayingTextElement.html(nameHtml);
var url;
- var imgHeight = 50;
+ var imgHeight = 60;
var nowPlayingItem = state.NowPlayingItem;
diff --git a/dashboard-ui/scripts/pluginspage.js b/dashboard-ui/scripts/pluginspage.js
index 71b4ca60d5..0624797a0d 100644
--- a/dashboard-ui/scripts/pluginspage.js
+++ b/dashboard-ui/scripts/pluginspage.js
@@ -84,10 +84,8 @@
html += '