diff --git a/dashboard-ui/cordova/chromecast.js b/dashboard-ui/cordova/chromecast.js index 0ea0d713d5..6cbe56e3d2 100644 --- a/dashboard-ui/cordova/chromecast.js +++ b/dashboard-ui/cordova/chromecast.js @@ -27,14 +27,14 @@ $(castPlayer).on("connect", function (e) { - console.log('cc: connect'); + Logger.log('cc: connect'); // Reset this so the next query doesn't make it appear like content is playing. self.lastPlayerData = {}; }); $(castPlayer).on("playbackstart", function (e, data) { - console.log('cc: playbackstart'); + Logger.log('cc: playbackstart'); var state = self.getPlayerStateInternal(data); $(self).trigger("playbackstart", [state]); @@ -42,7 +42,7 @@ $(castPlayer).on("playbackstop", function (e, data) { - console.log('cc: playbackstop'); + Logger.log('cc: playbackstop'); var state = self.getPlayerStateInternal(data); $(self).trigger("playbackstop", [state]); @@ -53,7 +53,7 @@ $(castPlayer).on("playbackprogress", function (e, data) { - console.log('cc: positionchange'); + Logger.log('cc: positionchange'); var state = self.getPlayerStateInternal(data); $(self).trigger("positionchange", [state]); @@ -418,7 +418,7 @@ data = data || self.lastPlayerData; self.lastPlayerData = data; - console.log(JSON.stringify(data)); + Logger.log(JSON.stringify(data)); return data; }; @@ -461,7 +461,7 @@ } function handleSessionDisconnect() { - console.log("session disconnected"); + Logger.log("session disconnected"); cleanupSession(); MediaController.removeActivePlayer(PlayerName); @@ -471,7 +471,7 @@ currentWebAppSession = webAppSession; - console.log('session.connect succeeded'); + Logger.log('session.connect succeeded'); webAppSession.setWebAppSessionListener(); MediaController.setActivePlayer(PlayerName, convertDeviceToTarget(device)); @@ -510,6 +510,7 @@ } function handleSessionError() { + Logger.log('chromecast session connect error'); cleanupSession(); } @@ -532,40 +533,46 @@ function tryLaunchWebSession(device) { - console.log('calling launchWebApp'); + Logger.log('calling launchWebApp'); device.getWebAppLauncher().launchWebApp(ApplicationID).success(function (session) { - console.log('launchWebApp success. calling onSessionConnected'); - setupWebAppSession(device, session, true); + Logger.log('launchWebApp success. calling onSessionConnected'); + if ($.browser.android) { + tryJoinWebSession(device, true, false); + } else { + setupWebAppSession(device, session, true); + } }).error(function (err1) { - console.log('launchWebApp error:' + JSON.stringify(err1)); + Logger.log('launchWebApp error:' + JSON.stringify(err1)); }); } - function tryJoinWebSession(device, enableRetry) { + function tryJoinWebSession(device, enableRetry, enableLaunch) { // First try to join existing session. If it fails, launch a new one - console.log('calling joinWebApp'); + Logger.log('calling joinWebApp'); device.getWebAppLauncher().joinWebApp(ApplicationID).success(function (session) { - console.log('joinWebApp success. calling onSessionConnected'); + Logger.log('joinWebApp success. calling onSessionConnected'); setupWebAppSession(device, session, false); }).error(function (err) { - console.log('joinWebApp error: ' + JSON.stringify(err)); + Logger.log('joinWebApp error: ' + JSON.stringify(err)); if (enableRetry) { - tryJoinWebSession(device, false); + tryJoinWebSession(device, false, true); return; } - console.log('calling launchWebApp'); - tryLaunchWebSession(device); + if (enableLaunch) { + Logger.log('calling launchWebApp'); + tryLaunchWebSession(device); + } }); } @@ -576,14 +583,14 @@ cleanupSession(); } - tryJoinWebSession(device, true); + tryJoinWebSession(device, true, true); } function onDeviceReady(device) { device.off("ready"); - console.log('creating webAppSession'); + Logger.log('creating webAppSession'); launchWebApp(device); } @@ -610,7 +617,7 @@ self.tryPairWithDevice = function (device, deferred) { - console.log('Will attempt to connect to Chromecast'); + Logger.log('Will attempt to connect to Chromecast'); device.on("disconnect", function () { device.off("ready"); @@ -618,18 +625,18 @@ }); if (device.isReady()) { - console.log('Device is already ready, calling onDeviceReady'); + Logger.log('Device is already ready, calling onDeviceReady'); onDeviceReady(device); } else { - console.log('Binding device ready handler'); + Logger.log('Binding device ready handler'); device.on("ready", function () { - console.log('device.ready fired'); + Logger.log('device.ready fired'); onDeviceReady(device); }); - console.log('Calling device.connect'); + Logger.log('Calling device.connect'); device.connect(); } }; diff --git a/dashboard-ui/cordova/sharingwidget.js b/dashboard-ui/cordova/sharingwidget.js new file mode 100644 index 0000000000..67572cd6dc --- /dev/null +++ b/dashboard-ui/cordova/sharingwidget.js @@ -0,0 +1,31 @@ +(function () { + + function showMenu(options, successCallback, cancelCallback) { + + Dashboard.confirm(Globalize.translate('ButtonShareHelp'), Globalize.translate('HeaderConfirm'), function (confirmed) { + + if (!confirmed) { + cancelCallback(options); + return; + } + + var shareInfo = options.share; + + window.plugins.socialsharing.share(shareInfo.Overview, shareInfo.Name, shareInfo.ImageUrl, shareInfo.Url, function () { + + successCallback(options); + + }, function () { + + cancelCallback(options); + }); + }); + + } + + window.SharingWidget = { + showMenu: showMenu + }; + + +})(); \ No newline at end of file diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index b191f19928..277ba54a5b 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -56,12 +56,21 @@ padding-top: 10px; } +.pageWithAbsoluteTabs .pageTabContent { + padding-top: 10px; +} + @media all and (max-width: 1200px) { .libraryPage > .ui-content { padding-left: .5em !important; padding-right: .5em !important; } + + .pageWithAbsoluteTabs .pageTabContent { + padding-left: .5em !important; + padding-right: .5em !important; + } } .libraryPage .currentUsername { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 6d39e7681c..744103a491 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -171,7 +171,6 @@ } .libraryViewNav { - height: 49px; overflow: hidden; position: fixed; right: 0; @@ -189,30 +188,32 @@ -webkit-overflow-scrolling: touch; } - .libraryViewNav .material-icons { - display: none; - } +.libraryViewNavWithMinHeight { + min-height: 48px; +} + +.viewMenuBar, .libraryViewNav { + background-color: #111; +} + +.paperLibraryViewNav { + background-color: transparent !important; +} + +.libraryViewNav .material-icons { + display: none; +} .bottomSecondaryNav .libraryViewNav { top: initial; bottom: 0; - border-top: 1px solid #444; - height: 51px; } -.viewMenuBar { - background-color: #111; +.libraryViewNav::-webkit-scrollbar { + height: 0 !important; + display: none; } -.libraryViewNav { - background-color: #111; -} - - .libraryViewNav::-webkit-scrollbar { - height: 0 !important; - display: none; - } - .viewMenuLink { text-decoration: none; color: #eee !important; @@ -253,12 +254,7 @@ background-color: #212121; } -.libraryViewNav:not(.paperLibraryViewNav) .ui-btn-active { - border-bottom-color: #38c; - color: #fff !important; -} - -.libraryViewNav:not(.paperLibraryViewNav) a { +.libraryViewNav a { display: inline-block; padding: 14px 13px 11px; color: rgba(255,255,255,.8) !important; @@ -266,37 +262,26 @@ margin: 0 0; position: relative; font-weight: normal; - border-bottom: 5px solid transparent; + border-bottom: 4px solid transparent; } -.paperLibraryViewNav a { - color: #ddd !important; - text-decoration: none; - text-align: center; - vertical-align: middle; - line-height: 48px; +.libraryViewNav .ui-btn-active { + border-bottom-color: #38c; + color: #fff !important; } -.paperLibraryViewNav .iron-selected a { +.libraryViewNav .iron-selected a { color: inherit !important; text-decoration: none; text-align: center; } -.basicPaperLibraryTabs .libraryViewNav .tab-content { - border-bottom: 6px solid transparent; -} - -.basicPaperLibraryTabs .libraryViewNav .iron-selected .tab-content { - border-bottom: 6px solid #38c; -} - .basicPaperLibraryTabs .libraryViewNav paper-tabs { display: none; } -.libraryViewNav:not(.paperLibraryViewNav) a:not(.ui-btn-active):hover { - color: #2ad !important; +.libraryViewNav a:not(.ui-btn-active):hover { + color: #2ad; } @media all and (max-width: 500px) { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index edd668c700..05e401b7e0 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -494,9 +494,14 @@ h1 a:hover { transform: translateY(-100%); } -.libraryViewNav.headroom--unpinned:not(.headroomDisabled) { - -webkit-transform: translateY(-200%); - transform: translateY(-200%); +.libraryViewNav:not(.paperLibraryViewNav).headroom--unpinned:not(.headroomDisabled) { + -webkit-transform: translateY(-203.5%); + transform: translateY(-203.5%); +} + +.paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) { + -webkit-transform: translateY(-203.5%); + transform: translateY(-203.5%); } .largePanel { diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html index bff333ca5b..56451e9d8d 100644 --- a/dashboard-ui/index.html +++ b/dashboard-ui/index.html @@ -7,7 +7,7 @@
-
+
home${TabHome} navigate_next${TabNextUp} @@ -15,10 +15,10 @@ schedule${TabUpcoming}
@@ -31,7 +31,7 @@
- +
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index 9c20226f6e..9a41101233 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -143,7 +143,7 @@ - + ${TabNowPlaying} ${TabControls} diff --git a/dashboard-ui/scripts/favorites.js b/dashboard-ui/scripts/favorites.js index edbd158c79..cc0603cc0e 100644 --- a/dashboard-ui/scripts/favorites.js +++ b/dashboard-ui/scripts/favorites.js @@ -118,7 +118,7 @@ var page = this; var tabContent = page.querySelector('.homeFavoritesTabContent'); - $(page.querySelector('neon-animated-pages')).on('iron-select', function () { + $(page.querySelector('neon-animated-pages')).on('tabchange', function () { if (parseInt(this.selected) == 2) { if (LibraryBrowser.needsRefresh(tabContent)) { diff --git a/dashboard-ui/scripts/homenextup.js b/dashboard-ui/scripts/homenextup.js index 088b51ae03..a92fb8b793 100644 --- a/dashboard-ui/scripts/homenextup.js +++ b/dashboard-ui/scripts/homenextup.js @@ -83,7 +83,7 @@ var page = this; var tabContent = page.querySelector('.homeNextUpTabContent'); - $(page.querySelector('neon-animated-pages')).on('iron-select', function () { + $(page.querySelector('neon-animated-pages')).on('tabchange', function () { if (parseInt(this.selected) == 1) { if (LibraryBrowser.needsRefresh(tabContent)) { diff --git a/dashboard-ui/scripts/homeupcoming.js b/dashboard-ui/scripts/homeupcoming.js index 03715738e8..b9752f3c42 100644 --- a/dashboard-ui/scripts/homeupcoming.js +++ b/dashboard-ui/scripts/homeupcoming.js @@ -64,7 +64,7 @@ var page = this; var tabContent = page.querySelector('.homeUpcomingTabContent'); - $(page.querySelector('neon-animated-pages')).on('iron-select', function () { + $(page.querySelector('neon-animated-pages')).on('tabchange', function () { if (parseInt(this.selected) == 3) { if (LibraryBrowser.needsRefresh(tabContent)) { diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js index 3d6e70f8a0..e1750be5f8 100644 --- a/dashboard-ui/scripts/indexpage.js +++ b/dashboard-ui/scripts/indexpage.js @@ -210,10 +210,6 @@ var page = this; - Events.on(page.querySelector('.btnTakeTour'), 'click', function () { - takeTour(page, Dashboard.getCurrentUserId()); - }); - var tabs = page.querySelector('paper-tabs'); LibraryBrowser.configurePaperLibraryTabs(page, page.querySelectorAll('paper-tabs')[0], page.querySelectorAll('neon-animated-pages')[0]); @@ -232,22 +228,25 @@ } }); - $(page.querySelector('neon-animated-pages')).on('iron-select', function () { + $(page.querySelector('neon-animated-pages')).on('tabchange', function () { loadTab(page, parseInt(this.selected)); }); - }).on('pagebeforeshowready', "#indexPage", function () { + $(page.querySelector('neon-animated-pages')).on('iron-select', function () { - var page = this; + // When transition animations are used, add a content loading delay to allow the animations to finish + // Otherwise with both operations happening at the same time, it can cause the animation to not run at full speed. + var delay = LibraryBrowser.enableFullPaperTabs() ? 500 : 0; + var pages = this; + setTimeout(function () { + $(pages).trigger('tabchange'); + }, delay); + }); - var tabs = page.querySelector('paper-tabs'); - var selected = tabs.selected; + Events.on(page.querySelector('.btnTakeTour'), 'click', function () { + takeTour(page, Dashboard.getCurrentUserId()); + }); - if (selected == null) { - selected = parseInt(getParameterByName('tab') || '0'); - tabs.selected = selected; - page.querySelector('neon-animated-pages').selected = selected; - } }); function getDisplayPreferencesAppName() { diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 715765a877..70b3508836 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -52,7 +52,7 @@ $('.btnSync', page).addClass('hide'); } - if (user.Policy.EnablePublicSharing) { + if (LibraryBrowser.canShare(item, user)) { $('.btnShare', page).removeClass('hide'); } else { $('.btnShare', page).addClass('hide'); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index a29846022e..75c16c35b0 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -90,12 +90,16 @@ } var now = new Date().getTime(); - var cacheDuration = 300000; - if (!AppInfo.isNativeApp && ($.browser.ipad || $.browser.iphone || $.browser.android)) { + var cacheDuration; + + if (AppInfo.isNativeApp) { + cacheDuration = 300000; + } + else if ($.browser.ipad || $.browser.iphone || $.browser.android) { cacheDuration = 10000; } - else if (!$.browser.mobile) { + else { cacheDuration = 60000; } @@ -167,13 +171,33 @@ tabs.hideScrollButtons = true; + if (AppInfo.enableBottomTabs) { + tabs.alignBottom = true; + tabs.classList.add('bottomTabs'); + } + if (LibraryBrowser.enableFullPaperTabs()) { $(tabs).show(); - LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages); + if ($.browser.safari) { - $('.libraryViewNav', ownerpage).addClass('paperLibraryViewNav'); + // Not very iOS-like I suppose + tabs.noSlide = true; + tabs.noink = true; + tabs.noBar = true; + } + else { + // Safari doesn't handle the horizontal swiping very well + + // Not very iOS-like I suppose + pages.entryAnimation = 'slide-from-right-animation'; + pages.exitAnimation = 'slide-left-animation'; + + LibraryBrowser.configureSwipeTabs(ownerpage, tabs, pages); + } + + $('.libraryViewNav', ownerpage).addClass('paperLibraryViewNav').removeClass('libraryViewNavWithMinHeight'); } else { @@ -190,7 +214,32 @@ var selected = this.selected; $('a', legacyTabs).removeClass('ui-btn-active')[selected].classList.add('ui-btn-active'); }); + + $('.libraryViewNav', ownerpage).removeClass('libraryViewNavWithMinHeight'); } + + $(ownerpage).on('pagebeforeshowready', LibraryBrowser.onTabbedPageBeforeShowReady); + }, + + onTabbedPageBeforeShowReady: function () { + var page = this; + + var tabs = page.querySelector('paper-tabs'); + var selected = tabs.selected; + + if (selected == null) { + selected = parseInt(getParameterByName('tab') || '0'); + tabs.selected = selected; + page.querySelector('neon-animated-pages').selected = selected; + + } else if (!LibraryBrowser.enableFullPaperTabs()) { + Events.trigger(page.querySelector('neon-animated-pages'), 'tabchange'); + } + }, + + canShare: function (item, user) { + + return user.Policy.EnablePublicSharing; }, getDateParamValue: function (date) { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index ad9937c23a..a6b291c910 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -323,6 +323,14 @@ }); } + if (user.Policy.EnablePublicSharing) { + items.push({ + name: Globalize.translate('ButtonShare'), + id: 'share', + ironIcon: 'share' + }); + } + if (commands.indexOf('sync') != -1) { items.push({ name: Globalize.translate('ButtonSync'), @@ -445,6 +453,11 @@ case 'externalplayer': LibraryBrowser.playInExternalPlayer(itemId); break; + case 'share': + require(['sharingmanager'], function () { + SharingManager.showMenu(Dashboard.getCurrentUserId(), itemId); + }); + break; case 'removefromplaylist': $(card).parents('.itemsContainer').trigger('removefromplaylist', [playlistItemId]); break; diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index dbda6a62d3..23719bf16b 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -664,34 +664,6 @@ return false; } - function getBackdropUrl(item) { - - var screenWidth = screen.availWidth; - - if (item.BackdropImageTags && item.BackdropImageTags.length) { - - return ApiClient.getScaledImageUrl(item.Id, { - type: "Backdrop", - index: 0, - maxWidth: screenWidth, - tag: item.BackdropImageTags[0] - }); - - } - else if (item.ParentBackdropItemId && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) { - - return ApiClient.getScaledImageUrl(item.ParentBackdropItemId, { - type: 'Backdrop', - index: 0, - maxWidth: screenWidth, - tag: item.ParentBackdropImageTags[0] - }); - - } - - return null; - }; - function updateCastIcon() { var info = MediaController.getPlayerInfo(); @@ -728,7 +700,10 @@ $('.requiresJqmCreate', this).trigger('create'); - LibraryBrowser.configureSwipeTabs(page, page.querySelectorAll('paper-tabs')[0], page.querySelectorAll('neon-animated-pages')[0]); + var tabs = page.querySelectorAll('paper-tabs')[0]; + tabs.alignBottom = true; + + LibraryBrowser.configureSwipeTabs(page, tabs, page.querySelectorAll('neon-animated-pages')[0]); $(MediaController).on('playerchange', function () { updateCastIcon(page); diff --git a/dashboard-ui/scripts/sharingwidget.js b/dashboard-ui/scripts/sharingwidget.js index c159aeb8b4..84c0532f61 100644 --- a/dashboard-ui/scripts/sharingwidget.js +++ b/dashboard-ui/scripts/sharingwidget.js @@ -14,7 +14,14 @@ html += '

' + Globalize.translate('HeaderShare') + '

'; html += '
'; - html += '
'; + html += '
'; + + // We can only do facebook if we can guarantee that the current page is available over the internet, since FB will try to probe it. + if (Dashboard.isConnectMode()) { + html += ''; + } + + html += '
'; html += '
'; html += '
'; diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index e1f4c6de8b..2660f4134e 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -595,7 +595,7 @@ var Dashboard = { callback(index == 1); - }, title || Globalize.translate('HeaderAlert'), buttonLabels.join(',')); + }, title || Globalize.translate('HeaderConfirm'), buttonLabels.join(',')); } else { Dashboard.confirmInternal(message, title, true, callback); @@ -1974,7 +1974,6 @@ var AppInfo = {}; define("connectservice", ["apiclient/connectservice"]); define("paperbuttonstyle", [], function () { - Dashboard.importCss('thirdparty/paper-button-style.css'); return {}; }); define("jqmicons", [], function () { @@ -2001,7 +2000,12 @@ var AppInfo = {}; } define("sharingmanager", ["scripts/sharingmanager"]); - define("sharingwidget", ["scripts/sharingwidget"]); + + if (Dashboard.isRunningInCordova()) { + define("sharingwidget", ["cordova/sharingwidget"]); + } else { + define("sharingwidget", ["scripts/sharingwidget"]); + } //requirejs(['http://viblast.com/player/free-version/qy2fdwajo1/viblast.js']); @@ -2181,7 +2185,7 @@ $(document).on('pagecreate', ".page", function () { } } - if (!isConnectMode && this.id !== "loginPage" && !page.classList.contains('forgotPasswordPage') && !page.classList.contains('wizardPage')) { + if (!isConnectMode && this.id !== "loginPage" && !page.classList.contains('forgotPasswordPage') && !page.classList.contains('wizardPage') && this.id !== 'publicSharedItemPage') { Logger.log('Not logged into server. Redirecting to login.'); Dashboard.logout(); diff --git a/dashboard-ui/share.html b/dashboard-ui/share.html index a55ab8bb6b..a3545bae5e 100644 --- a/dashboard-ui/share.html +++ b/dashboard-ui/share.html @@ -4,7 +4,7 @@ Emby -
+
diff --git a/dashboard-ui/themes/android.css b/dashboard-ui/themes/android.css index 2d4c5108df..8e87fec792 100644 --- a/dashboard-ui/themes/android.css +++ b/dashboard-ui/themes/android.css @@ -1,9 +1,9 @@ -.viewMenuBar, .libraryViewNav { - background-color: #191919; +.viewMenuBar, .libraryViewNav:not(.paperLibraryViewNav), paper-tabs { + background-color: #1b1b1b; } -.ui-page-theme-b { - background-color: #292929; +.ui-page-theme-b:not(.pageWithAbsoluteTabs), .pageWithAbsoluteTabs .pageBackground { + background-color: #2b2b2b; } .backdropPage.ui-page-theme-b { @@ -17,6 +17,11 @@ .ui-page-theme-b .visualCardBox { background: rgba(56,56,56,.85); } -.libraryViewNav a{ - font-weight: 500; -} \ No newline at end of file + +.libraryViewNav a { + font-weight: 500!important; +} + +paper-tab { + font-weight: 500!important; +} diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index b0f633fc48..16fc0eb2a6 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -9,7 +9,7 @@ html, body { } -.viewMenuBar, .libraryViewNav { +.viewMenuBar, .libraryViewNav, paper-tabs { background-color: rgba(28,28,28,.97); } @@ -25,7 +25,29 @@ html, body { font-weight: 400; text-transform: none; color: #ccc !important; - padding-top: 16px; + padding: 12px 13px 8px; +} + +.libraryViewNav .tab-content { + display: block !important; +} + +.libraryViewNav paper-tab { + height: auto !important; +} + +.libraryViewNav .material-icons { + display: block; + margin-top: -6px; + font-size: 15px; +} + +.libraryViewNav paper-tab .material-icons { + margin-top: 0; +} + +.libraryViewNav #selectionBar { + background-color: transparent !important; } @media all and (max-width: 600px) { @@ -36,13 +58,19 @@ html, body { } } -.libraryViewNav .ui-btn-active { - border-bottom-color: transparent; +.libraryViewNav a { + border-bottom: 0; +} + +.libraryViewNav .ui-btn-active, .libraryViewNav .iron-selected { color: #539FFD !important; } .libraryViewNav { - border-top: 1px solid #333; + border-top: 1px solid #333 !important; +} + +.libraryViewNav, paper-tabs { font-size: 12px; } @@ -92,6 +120,10 @@ h1, h1 a { font-weight: 400; } +paper-tab { + text-transform: none !important; +} + .visualCardBox { background: none !important; -moz-box-shadow: none; @@ -118,12 +150,6 @@ h1, h1 a { margin: 0 auto !important; } -.libraryViewNav .material-icons { - display: block; - margin-top: -6px; - font-size: 15px; -} - .btnActiveCast i { color: #539FFD !important; } diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 62422a9a68..a1623b71ef 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -250,17 +250,13 @@ paper-dialog[role="alertdialog"] + iron-overlay-backdrop { background-color: #000 !important; } -paper-tabs, paper-toolbar { +paper-tabs { background-color: #111; color: #fff; box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2); } - paper-toolbar paper-tabs { - box-shadow: none; - } - - paper-tabs[alignBottom] { + paper-tabs.bottomTabs { box-shadow: 0px -2px 6px rgba(0, 0, 0, 0.15); } @@ -269,11 +265,11 @@ paper-tab { font-weight: 400; } -paper-tabs:not([alignbottom]) #selectionBar { +paper-tabs #selectionBar { background-color: #38c !important; } -paper-tabs:not([alignbottom]) paper-ripple { +paper-tabs paper-ripple { color: #38c !important; } @@ -320,15 +316,17 @@ paper-menu-item { padding: .35em .5em; } -paper-menu-item iron-icon { - margin-right: 1.5em; -} + paper-menu-item iron-icon { + margin-right: 1.5em; + } + .actionSheetMenuItem { cursor: pointer; } -.actionSheetMenuItem:hover { - background: #eee; -} + + .actionSheetMenuItem:hover { + background: #eee; + } .scrollablePaperTabs paper-icon-button { display: none !important; diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index 3a7b715401..ce5dd1f5eb 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -1,17201 +1,17386 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - }; - - + + + + - - ... - - -
Item 1
-
Item 2
-
Item 3
- - - @demo demo/index.html - */ - - Polymer({ - - is: 'iron-selector', - - behaviors: [ - Polymer.IronMultiSelectableBehavior - ] - - }); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -