diff --git a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json index 75f9aadbc3..845de2758a 100644 --- a/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json +++ b/dashboard-ui/bower_components/iron-a11y-keys-behavior/.bower.json @@ -29,14 +29,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", + "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior", "_release": "1.0.6", "_resolution": { "type": "version", "tag": "v1.0.6", "commit": "af5c98b1cf9b3d180a6326c99ac9c7057eee647f" }, - "_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", + "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-a11y-keys-behavior" + "_originalSource": "PolymerElements/iron-a11y-keys-behavior" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index 7f83839174..9ce976fb30 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -27,14 +27,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/polymerelements/iron-behaviors", + "homepage": "https://github.com/PolymerElements/iron-behaviors", "_release": "1.0.9", "_resolution": { "type": "version", "tag": "v1.0.9", "commit": "4b8cab62a4916cc4b1dbd262cbb7eb1eec624b6f" }, - "_source": "git://github.com/polymerelements/iron-behaviors.git", + "_source": "git://github.com/PolymerElements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-behaviors" + "_originalSource": "PolymerElements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-icons/.bower.json b/dashboard-ui/bower_components/iron-icons/.bower.json index f7f404e3f7..0186178629 100644 --- a/dashboard-ui/bower_components/iron-icons/.bower.json +++ b/dashboard-ui/bower_components/iron-icons/.bower.json @@ -40,7 +40,7 @@ "tag": "v1.0.4", "commit": "1a54850a7196eb8d9d7ec1c4dea064972b7bfd4c" }, - "_source": "git://github.com/polymerelements/iron-icons.git", + "_source": "git://github.com/PolymerElements/iron-icons.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-icons" + "_originalSource": "PolymerElements/iron-icons" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 9e650790be..8119ebcf41 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -25,14 +25,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" }, - "_source": "git://github.com/PolymerElements/iron-meta.git", + "_source": "git://github.com/polymerelements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-meta" + "_originalSource": "polymerelements/iron-meta" } \ 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 8c65ba5e1a..ae0aab2a97 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -38,7 +38,7 @@ "tag": "v1.0.7", "commit": "0b2f484ac3b1b03400da2d38b0f543f3688150a4" }, - "_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/cordova/android/iap.js b/dashboard-ui/cordova/android/iap.js index 5da8db3cbb..716f4065ca 100644 --- a/dashboard-ui/cordova/android/iap.js +++ b/dashboard-ui/cordova/android/iap.js @@ -68,7 +68,7 @@ options.push({ feature: 'embypremieremonthly', - buttonText: 'EmbyPremiereMonthlyWithPrice' + buttonText: 'EmbyPremiereMonthly' }); options = options.filter(function (o) { diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 2f9c390f62..119d29866e 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -75,31 +75,27 @@ bottom: 0; right: 0; color: #333; + width: 20px; + height: 20px; + background-color: rgba(210,210,210,.9); + border-radius: 500px; + padding: 6px; + margin: 0 .5em .5em 0; } - .cardOverlayPlayButton iron-icon { - width: 20px; - height: 20px; - background-color: rgba(210,210,210,.9); - border-radius: 500px; - padding: 6px; - } - .cardOverlayMoreButton { position: absolute; bottom: 0; right: 0; color: #333; + width: 20px; + height: 20px; + background-color: rgba(210,210,210,.9); + border-radius: 500px; + padding: 6px; + margin: 0 .5em .5em 0; } - .cardOverlayMoreButton iron-icon { - width: 20px; - height: 20px; - background-color: rgba(210,210,210,.9); - border-radius: 500px; - padding: 6px; - } - .grayscale { -webkit-filter: grayscale(100%); -moz-filter: grayscale(100%); diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index ea0b75518b..204996ec15 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -369,6 +369,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { background: #444; width: 40px; height: 40px; + padding: 8px; } .itemBackdrop { @@ -1223,7 +1224,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { height: 50px; background: #388E3C; z-index: 1000; - padding: 0 .5em 0 .25em; + padding: 0 .75em 0 .25em; } .selectionCommandsPanel paper-icon-button { @@ -1239,7 +1240,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { padding-top: 1px; } -.selectionCommandsPanel iron-icon { +.selectionCommandsPanel paper-icon-button { height: 32px; width: 32px; } @@ -1735,10 +1736,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { z-index: 1002; } - .btnStopSlideshow iron-icon { - width: 40px; - height: 40px; - } +.btnStopSlideshow { + width: 40px; + height: 40px; +} @media all and (max-width:1200px) { diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 8207fab80c..3f63c08348 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -65,7 +65,7 @@ padding-top: .5em; } - .videoAdvancedControls iron-icon { + .videoAdvancedControls paper-icon-button { width: 30px; height: 30px; } diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css index 333be0b0a0..bc085f1a70 100644 --- a/dashboard-ui/css/mediaplayer.css +++ b/dashboard-ui/css/mediaplayer.css @@ -18,7 +18,7 @@ max-width: 130px; } -.mediaButton.infoButton iron-icon { +.mediaButton.infoButton { width: 34px; height: 34px; } diff --git a/dashboard-ui/css/nowplaying.css b/dashboard-ui/css/nowplaying.css index fd9241807c..9e401dd281 100644 --- a/dashboard-ui/css/nowplaying.css +++ b/dashboard-ui/css/nowplaying.css @@ -11,8 +11,10 @@ .nowPlayingPage .btnCommand, .nowPlayingPage .btnPlayStateCommand { margin: 2px 1px; - width: 70px; - height: 70px; +} + +.nowPlayingPage .btnCommand:not(.hide), .nowPlayingPage .btnPlayStateCommand:not(.hide) { + display: inline-block !important; } .nowPlayingPageImage img { @@ -218,7 +220,7 @@ } } -.nowPlayingPageUserDataButtons iron-icon { +.nowPlayingPageUserDataButtons paper-icon-button { width: 40px; height: 40px; } diff --git a/dashboard-ui/css/nowplayingbar.css b/dashboard-ui/css/nowplayingbar.css index 3e04826484..8a5b3a2ebb 100644 --- a/dashboard-ui/css/nowplayingbar.css +++ b/dashboard-ui/css/nowplayingbar.css @@ -16,12 +16,12 @@ text-align: center; } - .mediaButton iron-icon { - height: 40px; - width: 40px; - } +.mediaButton { + height: 40px; + width: 40px; +} - .mediaButton.remoteControlButton iron-icon, .mediaButton.muteButton iron-icon, .mediaButton.unmuteButton iron-icon { + .mediaButton.remoteControlButton, .mediaButton.muteButton, .mediaButton.unmuteButton { height: 26px; } @@ -62,7 +62,7 @@ max-width: 130px; } -.toggleRepeatButton iron-icon { +.toggleRepeatButton { height: 32px; } @@ -144,8 +144,8 @@ } .nowPlayingBarPositionSlider #sliderKnobInner { - width: 16px; - height: 16px; + width: 14px; + height: 14px; } .nowPlayingBarRight { diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html index 0dc6a5e1b7..ae617cb436 100644 --- a/dashboard-ui/mypreferencesmenu.html +++ b/dashboard-ui/mypreferencesmenu.html @@ -77,7 +77,6 @@ -
diff --git a/dashboard-ui/strings/javascript/javascript.json b/dashboard-ui/strings/javascript/javascript.json index 4ac6d38315..63a5cf2655 100644 --- a/dashboard-ui/strings/javascript/javascript.json +++ b/dashboard-ui/strings/javascript/javascript.json @@ -905,6 +905,7 @@ "HeaderNextUp": "Next Up", "HeaderLatestMovies": "Latest Movies", "HeaderLatestEpisodes": "Latest Episodes", + "EmbyPremiereMonthly": "Emby Premiere Monthly", "EmbyPremiereMonthlyWithPrice": "Emby Premiere Monthly {0}", "HeaderEmailAddress": "E-Mail Address", "TextPleaseEnterYourEmailAddressForSubscription": "Please enter your e-mail address." diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index 05ffe22582..0483dc9eae 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -118,20 +118,16 @@ paper-button span { vertical-align: middle; } -paper-button:not(.iconRight) iron-icon, paper-button:not(.iconRight) .fa { +paper-button:not(.iconRight) > iron-icon { margin-right: .5em; } -paper-button.iconRight iron-icon, paper-button.iconRight .fa { +paper-button.iconRight iron-icon { position: absolute; right: 5px; top: 5px; } -paper-button .fa { - vertical-align: middle; -} - .clearButton { background: transparent; border: 0; @@ -332,12 +328,15 @@ paper-slider { .paper-slider-0 paper-ripple.paper-slider { color: #52B54B; } + .paper-progress-0 #primaryProgress.paper-progress { background-color: #52B54B; } + .paper-progress-0 #secondaryProgress.paper-progress { background-color: #92B54B; } + paper-menu-item { padding: .35em .5em; cursor: pointer; @@ -573,4 +572,4 @@ paper-toggle-button paper-ripple { paper-progress.mini #progressContainer { height: 3px !important; -} +} \ No newline at end of file