diff --git a/dashboard-ui/bower_components/iron-menu-behavior/.bower.json b/dashboard-ui/bower_components/iron-menu-behavior/.bower.json index 052cd1c2bb..7ca24d4128 100644 --- a/dashboard-ui/bower_components/iron-menu-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-menu-behavior/.bower.json @@ -35,7 +35,7 @@ "tag": "v1.0.1", "commit": "3809f0eb7461c8ca63640aaa238775b3a25aa578" }, - "_source": "git://github.com/polymerelements/iron-menu-behavior.git", + "_source": "git://github.com/PolymerElements/iron-menu-behavior.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-menu-behavior" + "_originalSource": "PolymerElements/iron-menu-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 31050826e9..68996d04d0 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -28,14 +28,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-selector", + "homepage": "https://github.com/polymerelements/iron-selector", "_release": "1.0.2", "_resolution": { "type": "version", "tag": "v1.0.2", "commit": "ea22d91d11ba6f72c01faa952d5e600f9d1773cf" }, - "_source": "git://github.com/PolymerElements/iron-selector.git", + "_source": "git://github.com/polymerelements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-selector" + "_originalSource": "polymerelements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-button/.bower.json b/dashboard-ui/bower_components/paper-button/.bower.json index 7dea19b0cf..5a95d419f7 100644 --- a/dashboard-ui/bower_components/paper-button/.bower.json +++ b/dashboard-ui/bower_components/paper-button/.bower.json @@ -1,6 +1,6 @@ { "name": "paper-button", - "version": "1.0.1", + "version": "1.0.2", "description": "Material design button", "authors": [ "The Polymer Authors" @@ -36,14 +36,13 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "_release": "1.0.1", + "_release": "1.0.2", "_resolution": { "type": "version", - "tag": "v1.0.1", - "commit": "e11a0603feaaedd8cf6c7e0d533bdc67de24c8de" + "tag": "v1.0.2", + "commit": "e804f62099c79f909ec9f94d78b790bff7b88682" }, "_source": "git://github.com/PolymerElements/paper-button.git", "_target": "~1.0.1", - "_originalSource": "PolymerElements/paper-button", - "_direct": true + "_originalSource": "PolymerElements/paper-button" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-button/bower.json b/dashboard-ui/bower_components/paper-button/bower.json index 940aa6d159..bd89d5c2ee 100644 --- a/dashboard-ui/bower_components/paper-button/bower.json +++ b/dashboard-ui/bower_components/paper-button/bower.json @@ -1,6 +1,6 @@ { "name": "paper-button", - "version": "1.0.1", + "version": "1.0.2", "description": "Material design button", "authors": [ "The Polymer Authors" diff --git a/dashboard-ui/bower_components/paper-button/paper-button.html b/dashboard-ui/bower_components/paper-button/paper-button.html index 897ccc6022..57f716c91b 100644 --- a/dashboard-ui/bower_components/paper-button/paper-button.html +++ b/dashboard-ui/bower_components/paper-button/paper-button.html @@ -31,7 +31,7 @@ You may use custom DOM in the button body to create a variety of buttons. For ex create a button with an icon and some text: - + custom button content diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index 1e2fc8232e..fc6b880ada 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -14,144 +14,142 @@ - + diff --git a/dashboard-ui/scripts/nowplayingpage.js b/dashboard-ui/scripts/nowplayingpage.js index caba36cf41..acfa4ca40a 100644 --- a/dashboard-ui/scripts/nowplayingpage.js +++ b/dashboard-ui/scripts/nowplayingpage.js @@ -703,29 +703,31 @@ $('.sendMessageForm').off('submit', NowPlayingPage.onMessageSubmit).on('submit', NowPlayingPage.onMessageSubmit); $('.typeTextForm').off('submit', NowPlayingPage.onSendStringSubmit).on('submit', NowPlayingPage.onSendStringSubmit); - $('iron-pages,neon-animatable', this).trigger('create'); + $('.requiresJqmCreate', this).trigger('create'); $(page).on('swipeleft', function () { var pages = this.querySelectorAll('neon-animated-pages')[0]; + var tabs = this.querySelectorAll('paper-tabs')[0]; var selected = parseInt(pages.selected || '0'); if (selected < 2) { pages.entryAnimation = 'slide-from-right-animation'; pages.exitAnimation = 'slide-left-animation'; - pages.selectNext(); + tabs.selectNext(); } }); $(page).on('swiperight', function () { var pages = this.querySelectorAll('neon-animated-pages')[0]; + var tabs = this.querySelectorAll('paper-tabs')[0]; var selected = parseInt(pages.selected || '0'); if (selected > 0) { pages.entryAnimation = 'slide-from-left-animation'; pages.exitAnimation = 'slide-right-animation'; - pages.selectPrevious(); + tabs.selectPrevious(); } }); @@ -733,6 +735,10 @@ updateCastIcon(page); }); + $('paper-tabs').on('iron-select', function () { + page.querySelectorAll('neon-animated-pages')[0].selected = this.selected; + }); + }).on('pagebeforeshowready', "#nowPlayingPage", function () { $(document.body).addClass('hiddenViewMenuBar'); @@ -755,7 +761,8 @@ loadPlaylist(page); var tab = getParameterByName('tab'); - this.querySelectorAll('#scope')[0].selected = tab == 'Playlist' ? 2 : 0; + var selected = tab == 'Playlist' ? 2 : 0;; + this.querySelectorAll('paper-tabs')[0].selected = selected; updateCastIcon(page); diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css index 789a657fb0..c0f76d7e0c 100644 --- a/dashboard-ui/themes/ios.css +++ b/dashboard-ui/themes/ios.css @@ -1,9 +1,14 @@ -html, body { +html { font-family: Helvetica Neue; /* Setting it here will help prevent white flashes */ background-color: #1c1c1c; } +html, body { + font-family: Helvetica Neue; +} + + .viewMenuBar, .libraryViewNav { background-color: rgba(28,28,28,.97); } diff --git a/dashboard-ui/vulcanize-in.html b/dashboard-ui/vulcanize-in.html index 9137c57be4..f53d747f08 100644 --- a/dashboard-ui/vulcanize-in.html +++ b/dashboard-ui/vulcanize-in.html @@ -15,5 +15,4 @@ - \ No newline at end of file diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html index 00ed025cad..75c6672ea1 100644 --- a/dashboard-ui/vulcanize-out.html +++ b/dashboard-ui/vulcanize-out.html @@ -11252,8 +11252,6 @@ The `aria-labelledby` attribute will be set to the header element, if one exists - -