diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index 6605440c2e..8e7dfb90e3 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.3.25", - "_release": "1.3.25", + "version": "1.3.26", + "_release": "1.3.26", "_resolution": { "type": "version", - "tag": "1.3.25", - "commit": "004eca200cd748222897d11f6bd92a29899d7945" + "tag": "1.3.26", + "commit": "094d2fc7c9e0c008e1c44744da95a69d1aa6516f" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.0", diff --git a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css index 296942546a..e87ed7f43e 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/formdialog.css +++ b/dashboard-ui/bower_components/emby-webcomponents/formdialog.css @@ -24,10 +24,14 @@ } .formDialog .dialogContentInner { - padding-bottom: 50vh; + padding-bottom: 10vh; padding-top: 1em; } +.layout-tv .formDialog .dialogContentInner { + padding-bottom: 50vh; +} + @media all and (min-width: 1000px) { .formDialog form { diff --git a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json index fe6db4e19a..e21da03819 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json +++ b/dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json @@ -49,5 +49,5 @@ "Download": "Download", "Advanced": "Advanced", "Refresh": "Refresh", - "RefreshQueued": "Refresh queued" + "RefreshQueued": "Refresh queued." } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json b/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json index 1baafa9707..d0996a0614 100644 --- a/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-announcer/.bower.json @@ -30,14 +30,14 @@ "web-component-tester": "polymer/web-component-tester#^3.4.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/iron-a11y-announcer", + "homepage": "https://github.com/PolymerElements/iron-a11y-announcer", "_release": "1.0.4", "_resolution": { "type": "version", "tag": "v1.0.4", "commit": "5ce3eb8c4282bb53cd72e348858dc6be6b4c50b9" }, - "_source": "git://github.com/polymerelements/iron-a11y-announcer.git", + "_source": "git://github.com/PolymerElements/iron-a11y-announcer.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-a11y-announcer" + "_originalSource": "PolymerElements/iron-a11y-announcer" } \ 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 1da99816d3..e5306ccfc9 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.5.1", "commit": "e3e34408fad8f7cde59c4255cf3fe90f7dcf91d8" }, - "_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-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json index 2b04bf9f8a..a6b333d335 100644 --- a/dashboard-ui/bower_components/paper-behaviors/.bower.json +++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json @@ -45,7 +45,7 @@ "tag": "v1.0.11", "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" }, - "_source": "git://github.com/PolymerElements/paper-behaviors.git", + "_source": "git://github.com/polymerelements/paper-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-behaviors" + "_originalSource": "polymerelements/paper-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 157225ee71..2f654d71c6 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_source": "git://github.com/PolymerElements/paper-ripple.git", + "_source": "git://github.com/polymerelements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/paper-ripple" + "_originalSource": "polymerelements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/polymer/.bower.json b/dashboard-ui/bower_components/polymer/.bower.json index bbad7fe7ba..3e8a4009a3 100644 --- a/dashboard-ui/bower_components/polymer/.bower.json +++ b/dashboard-ui/bower_components/polymer/.bower.json @@ -34,6 +34,6 @@ "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" }, "_source": "git://github.com/Polymer/polymer.git", - "_target": "^1.1.0", + "_target": "^1.0.0", "_originalSource": "Polymer/polymer" } \ No newline at end of file diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html index 38c23341e0..8a4bd375f8 100644 --- a/dashboard-ui/channels.html +++ b/dashboard-ui/channels.html @@ -1,20 +1,16 @@ -
+
-
-
-
- ${TabLatest} - ${TabChannels} -
-
-
-
-
-
-
-
-
+
+ + +
+
+
+
+
+
+
diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js index 343228ce2d..e077b0a60c 100644 --- a/dashboard-ui/components/remotecontrol.js +++ b/dashboard-ui/components/remotecontrol.js @@ -32,12 +32,12 @@ } var menuItem = { - name: name, + name: s.DisplayTitle || name, id: s.Index }; if (s.Index == currentIndex) { - menuItem.ironIcon = 'check'; + menuItem.selected = true; } return menuItem; @@ -83,12 +83,12 @@ } var menuItem = { - name: name, + name: s.DisplayTitle || name, id: s.Index }; if (s.Index == currentIndex) { - menuItem.ironIcon = 'check'; + menuItem.selected = true; } return menuItem; @@ -459,7 +459,7 @@ } function isPlaylistOpen(context) { - return libraryBrowser.selectedTab(context.querySelector('.mdl-tabs')) == 2; + return libraryBrowser.selectedTab(context.querySelector('.libraryViewNav')) == 2; } function onStateChanged(e, state) { @@ -813,7 +813,7 @@ // showSlideshowMenu(context); //}); - var mdlTabs = context.querySelector('.mdl-tabs'); + var mdlTabs = context.querySelector('.libraryViewNav'); if (AppInfo.enableNowPlayingPageBottomTabs) { context.querySelector('.libraryViewNav').classList.add('bottom'); @@ -821,7 +821,7 @@ context.querySelector('.libraryViewNav').classList.remove('bottom'); } - libraryBrowser.configurePaperLibraryTabs(ownerView, mdlTabs); + libraryBrowser.configurePaperLibraryTabs(ownerView, mdlTabs, ownerView.querySelectorAll('.pageTabContent')); mdlTabs.addEventListener('tabchange', function (e) { if (e.detail.selectedTabIndex == 2 && playlistNeedsRefresh) { @@ -862,7 +862,6 @@ context.querySelector('.topRightContainer').style.position = 'relative'; } - componentHandler.upgradeAllRegistered(dlg); init(ownerView, dlg); }; diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index 54284e9aec..3a406d6c80 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -29,6 +29,10 @@ bottom: -92px !important; } +.pageTabContent:not(.is-active) { + display: none !important; +} + .sidebarDivider { height: 1px; background: #eaeaea; @@ -181,51 +185,71 @@ text-transform: uppercase; white-space: nowrap; padding: 0 0 0; - overflow-x: scroll; - -ms-overflow-style: none; - overflow: -moz-scrollbars-none; - -webkit-overflow-scrolling: touch; box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.2); } .libraryViewNav.bottom { - top: auto!important; + top: auto !important; bottom: 0; } - .libraryViewNav .mdl-tabs__tab-bar { - -webkit-justify-content: initial; - justify-content: initial; - display: inline-flex; - text-align: center; - margin: 0 auto; - } +.libraryViewNav { + justify-content: center; + display: flex; + display: block; + text-align: center; + margin: 0 auto; + align-items: center; +} - - .libraryViewNav .mdl-tabs__tab { - color: #aaa !important; - padding: 0 1.25em; - float: none; + .libraryViewNav .pageTabButton { + background: transparent; + border: 0 !important; + cursor: pointer; + outline: none !important; + width: auto; + font-family: inherit; + font-size: inherit; + color: #999 !important; + display: inline-block; + vertical-align: middle; flex-shrink: 0; + margin: 0; + padding: 1.2em .9em; + transition: none !important; + position: relative; + text-transform: uppercase; + font-weight: 500 !important; + height: auto; + min-width: initial; + line-height: initial; } - .libraryViewNav .mdl-tabs__tab.is-active { + .libraryViewNav .pageTabButton:focus { + font-weight: 500 !important; + } + + .libraryViewNav .pageTabButton.is-active { color: #fff !important; } - .libraryViewNav .mdl-tabs__tab.is-active:after { - background: #52B54B !important; - } + .libraryViewNav .pageTabButton:before { + content: ''; + position: absolute; + left: 0; + border: 0; + bottom: 0; + height: 2px; + transition: all .12s cubic-bezier(.4,0,1,1); + right: 0; + transform: translateX(-100%); + } - .libraryViewNav::-webkit-scrollbar { - height: 0 !important; - display: none; - } - - .libraryViewNav .mdl-tabs__tab .mdl-tabs__ripple-container .mdl-ripple { - background: #52B54B !important; - } + .libraryViewNav .pageTabButton.is-active:before { + transform: none; + background: #52B54B; + } .viewMenuBar, .libraryViewNav { background-color: #020202; diff --git a/dashboard-ui/devices/android/android.css b/dashboard-ui/devices/android/android.css index 84ed4957a6..30c942594d 100644 --- a/dashboard-ui/devices/android/android.css +++ b/dashboard-ui/devices/android/android.css @@ -2,17 +2,21 @@ font-weight: bold !important; } -.libraryViewNav .mdl-tabs__tab { +.libraryViewNav .pageTabButton { font-weight: bold !important; } + .libraryViewNav .pageTabButton:focus { + font-weight: bold !important; + } + @media all and (min-width: 300px) { - .libraryViewNav .mdl-tabs__tab-bar { + .libraryViewNav { display: flex; } - .libraryViewNav .mdl-tabs__tab { - flex-grow: 1; - } + .libraryViewNav .pageTabButton { + flex-grow: 1; + } } diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css index 27aae08e0a..8e7276211c 100644 --- a/dashboard-ui/devices/ios/ios.css +++ b/dashboard-ui/devices/ios/ios.css @@ -59,15 +59,11 @@ body:not(.dashboardDocument) .mainDrawerButton { padding: 12px 13px 8px; } - .libraryViewNav .mdl-tabs__ripple-container { + .libraryViewNav .pageTabButton.is-active:after { display: none !important; } - .libraryViewNav .mdl-tabs__tab.is-active:after { - display: none !important; - } - - .libraryViewNav .mdl-tabs__tab.is-active { + .libraryViewNav .pageTabButton.is-active { color: #52B54B !important; } diff --git a/dashboard-ui/home.html b/dashboard-ui/home.html index 38317f2494..010fd80323 100644 --- a/dashboard-ui/home.html +++ b/dashboard-ui/home.html @@ -1,49 +1,45 @@ 
-
-
-
- ${TabHome} - ${TabNextUp} - ${TabFavorites} - ${TabUpcoming} -
+
+ + + + +
+
+ -
- -
-
-
-
-
-

${HeaderNextUp}

- ${ButtonSync} -
-
-
+
+
+
+
+
+

${HeaderNextUp}

+ ${ButtonSync}
- -
-
-
-
-
-
-
- + +
+
+
+
+
+
+
+ -
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html index a886613acd..45e978a896 100644 --- a/dashboard-ui/livetv.html +++ b/dashboard-ui/livetv.html @@ -1,88 +1,84 @@ -
+
-
-
-
- ${TabSuggestions} - ${TabGuide} - ${TabChannels} - ${TabRecordings} - ${TabSeries} +
+ + + + + +
+
+
+

${HeaderWhatsOnTV}

+
+
+
+
+

${HeaderUpcomingPrograms}

+
+
+
+
+
+

${HeaderUpcomingMovies}

+ ${ButtonMoreItems} +
+
+
+
+
+
+

${HeaderUpcomingSports}

+ ${ButtonMoreItems} +
+
+
+
+
+
+

${HeaderUpcomingForKids}

+ ${ButtonMoreItems} +
+
+
+
+
+
+
+
+
+
-
-
-

${HeaderWhatsOnTV}

-
-
-
-
-

${HeaderUpcomingPrograms}

-
-
-
-
-
-

${HeaderUpcomingMovies}

- ${ButtonMoreItems} -
-
-
-
-
-
-

${HeaderUpcomingSports}

- ${ButtonMoreItems} -
-
-
-
-
-
-

${HeaderUpcomingForKids}

- ${ButtonMoreItems} -
-
-
-
+
+
+
+
+

${HeaderActiveRecordings}

+
+
-
+
+
+

${HeaderLatestRecordings}

+ ${ButtonSync} +
+
+
-
-
-
-
-
-
+
+
+
-
-
-

${HeaderActiveRecordings}

-
-
-
-
-
-

${HeaderLatestRecordings}

- ${ButtonSync} -
-
-
-
-
-
-
-
- + -
-
-
+
+
+
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html index 78812fb2f9..51fb488300 100644 --- a/dashboard-ui/movies.html +++ b/dashboard-ui/movies.html @@ -1,91 +1,87 @@ 
-
-
-
- ${TabSuggestions} - ${TabMovies} - ${TabTrailers} - ${TabCollections} - ${TabGenres} - ${TabStudios} -
-
-
-