diff --git a/app/pods/components/add-soundcloud-sound-modal/component.js b/app/pods/components/add-soundcloud-sound-modal/component.js index c2ac6e6..fb9b114 100644 --- a/app/pods/components/add-soundcloud-sound-modal/component.js +++ b/app/pods/components/add-soundcloud-sound-modal/component.js @@ -13,7 +13,13 @@ export default Em.Component.extend({ url: null, onIsShowingModalChange: function(){ - this.set('url', null); + if(this.get('isShowingModal')){ + this.set('url', null); + setTimeout(()=>{ + Em.$('md-input-container input').focus(); + }, 500); + } + }.observes('isShowingModal'), didInsertElement: function() { diff --git a/app/pods/components/hue-controls/component.js b/app/pods/components/hue-controls/component.js index e18a9aa..a81649f 100644 --- a/app/pods/components/hue-controls/component.js +++ b/app/pods/components/hue-controls/component.js @@ -127,6 +127,10 @@ export default Em.Component.extend({ } }, + dimmerOnClass: function(){ + return this.get('dimmerOn') ? 'dimmerOn' : null; + }.property('dimmerOn'), + ready: function() { return this.get('trial') || !Em.isNone(this.get('lightsData')); }.property('lightsData', 'trial') diff --git a/app/pods/components/hue-controls/template.hbs b/app/pods/components/hue-controls/template.hbs index 1831ef3..5741925 100644 --- a/app/pods/components/hue-controls/template.hbs +++ b/app/pods/components/hue-controls/template.hbs @@ -8,7 +8,7 @@
Strobe
{{#paper-switch checked=strobeOn disabled=trial skipProxy=trial}} {{strobeOnTxt}} {{/paper-switch}} {{/paper-item}} {{#paper-item}} - {{paper-icon icon="color-lens"}} {{paper-icon icon="loop" id="loopAddition"}} + {{paper-icon icon="color-lens" class=dimmerOnClass}} {{paper-icon icon="loop" id="loopAddition"}}Colorloop
{{#paper-switch checked=colorLoopOn disabled=trial skipProxy=trial}} {{colorloopOnTxt}} {{/paper-switch}} {{/paper-item}} diff --git a/app/styles/app.scss b/app/styles/app.scss index fd04b3a..7afecdf 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -64,6 +64,11 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper { display: inline-block; transition: 0.1s all ease-in-out; cursor: pointer; + span md-icon { + position: relative; + bottom: 5px; + right: 5px; + } } md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-slider[disabled=disabled] { @@ -838,8 +843,8 @@ md-switch.md-default-theme.md-checked .md-thumb { } .dimmerBulbOn { - fill: white; - stroke: white; + fill: gold; + stroke: gold; stroke-width: 10px; } @@ -890,6 +895,12 @@ body.dimmerOn { color: white !important; } } + .addNewMusic { + background: #2D2D2D; + } + .addNewMusic:hover { + background: darken(#2D2D2D, 5%); + } } .power-settings-new.dimmerOn, @@ -897,6 +908,8 @@ body.dimmerOn { .color-lens.dimmerOn, .flare.dimmerOn, .loop.dimmerOn, +.group.dimmerOn, +.settings.dimmerOn, .library-music.dimmerOn { color: inherit !important; text-shadow: $glowingText; @@ -959,22 +972,19 @@ button.md-warn { right: 0; left: initial; width: 100px; - top: 30px; + top: 25px; } .addNewMusic { + padding: 0 5px 0 10px; font-size: 16px; - padding: 3px; - color: white; - border: none; - text-shadow: 1px 1px 2px rgba(0,0,0,.8); - box-shadow: inset 1px 1px 9px rgba(135,30,10,.8),inset -1px -1px 5px rgba(181,60,2,.8); border-radius: 5px; - background: linear-gradient(#db8e01,#871e0a); + background: #f8f8f8; + border: none; } .addNewMusic:hover { - background: linear-gradient(lighten(#db8e01,5%), lighten(#871e0a,5%)); + background: darken(#f8f8f8, 5%); } .soundCloudLink { diff --git a/public/assets/images/favicons/android-chrome-144x144.png b/public/assets/images/favicons/android-chrome-144x144.png index 0771276..ca80184 100644 Binary files a/public/assets/images/favicons/android-chrome-144x144.png and b/public/assets/images/favicons/android-chrome-144x144.png differ diff --git a/public/assets/images/favicons/android-chrome-192x192.png b/public/assets/images/favicons/android-chrome-192x192.png index 604d8fa..56939f4 100644 Binary files a/public/assets/images/favicons/android-chrome-192x192.png and b/public/assets/images/favicons/android-chrome-192x192.png differ diff --git a/public/assets/images/favicons/android-chrome-36x36.png b/public/assets/images/favicons/android-chrome-36x36.png index 025f2db..e4bee32 100644 Binary files a/public/assets/images/favicons/android-chrome-36x36.png and b/public/assets/images/favicons/android-chrome-36x36.png differ diff --git a/public/assets/images/favicons/android-chrome-48x48.png b/public/assets/images/favicons/android-chrome-48x48.png index f18576d..afc828c 100644 Binary files a/public/assets/images/favicons/android-chrome-48x48.png and b/public/assets/images/favicons/android-chrome-48x48.png differ diff --git a/public/assets/images/favicons/android-chrome-72x72.png b/public/assets/images/favicons/android-chrome-72x72.png index 818bcaa..b05fb71 100644 Binary files a/public/assets/images/favicons/android-chrome-72x72.png and b/public/assets/images/favicons/android-chrome-72x72.png differ diff --git a/public/assets/images/favicons/android-chrome-96x96.png b/public/assets/images/favicons/android-chrome-96x96.png index aa0eaf4..666e6bb 100644 Binary files a/public/assets/images/favicons/android-chrome-96x96.png and b/public/assets/images/favicons/android-chrome-96x96.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-114x114.png b/public/assets/images/favicons/apple-touch-icon-114x114.png index 541d5ac..6908a4c 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-114x114.png and b/public/assets/images/favicons/apple-touch-icon-114x114.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-120x120.png b/public/assets/images/favicons/apple-touch-icon-120x120.png index 51769c2..3b112cc 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-120x120.png and b/public/assets/images/favicons/apple-touch-icon-120x120.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-144x144.png b/public/assets/images/favicons/apple-touch-icon-144x144.png index 1c58cb4..ca80184 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-144x144.png and b/public/assets/images/favicons/apple-touch-icon-144x144.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-152x152.png b/public/assets/images/favicons/apple-touch-icon-152x152.png index b83ccc2..c8cb905 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-152x152.png and b/public/assets/images/favicons/apple-touch-icon-152x152.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-180x180.png b/public/assets/images/favicons/apple-touch-icon-180x180.png index e0fd7ae..cc243af 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-180x180.png and b/public/assets/images/favicons/apple-touch-icon-180x180.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-57x57.png b/public/assets/images/favicons/apple-touch-icon-57x57.png index 7cf6fd3..892513c 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-57x57.png and b/public/assets/images/favicons/apple-touch-icon-57x57.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-60x60.png b/public/assets/images/favicons/apple-touch-icon-60x60.png index 7e859a3..f504793 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-60x60.png and b/public/assets/images/favicons/apple-touch-icon-60x60.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-72x72.png b/public/assets/images/favicons/apple-touch-icon-72x72.png index da30998..b05fb71 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-72x72.png and b/public/assets/images/favicons/apple-touch-icon-72x72.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-76x76.png b/public/assets/images/favicons/apple-touch-icon-76x76.png index 297c434..3119f62 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-76x76.png and b/public/assets/images/favicons/apple-touch-icon-76x76.png differ diff --git a/public/assets/images/favicons/apple-touch-icon-precomposed.png b/public/assets/images/favicons/apple-touch-icon-precomposed.png index add7fc6..413683e 100644 Binary files a/public/assets/images/favicons/apple-touch-icon-precomposed.png and b/public/assets/images/favicons/apple-touch-icon-precomposed.png differ diff --git a/public/assets/images/favicons/apple-touch-icon.png b/public/assets/images/favicons/apple-touch-icon.png index e0fd7ae..cc243af 100644 Binary files a/public/assets/images/favicons/apple-touch-icon.png and b/public/assets/images/favicons/apple-touch-icon.png differ diff --git a/public/assets/images/favicons/favicon-16x16.png b/public/assets/images/favicons/favicon-16x16.png index 59c7b46..4916020 100644 Binary files a/public/assets/images/favicons/favicon-16x16.png and b/public/assets/images/favicons/favicon-16x16.png differ diff --git a/public/assets/images/favicons/favicon-32x32.png b/public/assets/images/favicons/favicon-32x32.png index 28ef728..a16a5fc 100644 Binary files a/public/assets/images/favicons/favicon-32x32.png and b/public/assets/images/favicons/favicon-32x32.png differ diff --git a/public/assets/images/favicons/favicon-96x96.png b/public/assets/images/favicons/favicon-96x96.png index a041852..e755ae9 100644 Binary files a/public/assets/images/favicons/favicon-96x96.png and b/public/assets/images/favicons/favicon-96x96.png differ diff --git a/public/assets/images/favicons/favicon.ico b/public/assets/images/favicons/favicon.ico index ae53d4e..d9f3449 100644 Binary files a/public/assets/images/favicons/favicon.ico and b/public/assets/images/favicons/favicon.ico differ diff --git a/public/assets/images/favicons/mstile-144x144.png b/public/assets/images/favicons/mstile-144x144.png index fdef3d7..d795c62 100644 Binary files a/public/assets/images/favicons/mstile-144x144.png and b/public/assets/images/favicons/mstile-144x144.png differ diff --git a/public/assets/images/favicons/mstile-150x150.png b/public/assets/images/favicons/mstile-150x150.png index df1b537..3266a61 100644 Binary files a/public/assets/images/favicons/mstile-150x150.png and b/public/assets/images/favicons/mstile-150x150.png differ diff --git a/public/assets/images/favicons/mstile-310x150.png b/public/assets/images/favicons/mstile-310x150.png index b594a39..6cd04d6 100644 Binary files a/public/assets/images/favicons/mstile-310x150.png and b/public/assets/images/favicons/mstile-310x150.png differ diff --git a/public/assets/images/favicons/mstile-310x310.png b/public/assets/images/favicons/mstile-310x310.png index 16d8f42..b5645ce 100644 Binary files a/public/assets/images/favicons/mstile-310x310.png and b/public/assets/images/favicons/mstile-310x310.png differ diff --git a/public/assets/images/favicons/mstile-70x70.png b/public/assets/images/favicons/mstile-70x70.png index 92f885d..15f2b63 100644 Binary files a/public/assets/images/favicons/mstile-70x70.png and b/public/assets/images/favicons/mstile-70x70.png differ diff --git a/public/assets/images/favicons/safari-pinned-tab.svg b/public/assets/images/favicons/safari-pinned-tab.svg index 6bec049..0c24c2c 100644 --- a/public/assets/images/favicons/safari-pinned-tab.svg +++ b/public/assets/images/favicons/safari-pinned-tab.svg @@ -9,402 +9,37 @@ Created by potrace 1.11, written by Peter Selinger 2001-2013