From 17eb7a550117a8ca289aab0a22ca9ddadf4ed581 Mon Sep 17 00:00:00 2001 From: Egor Date: Wed, 21 Oct 2015 01:18:26 -0700 Subject: [PATCH] styling --- .../add-soundcloud-sound-modal/component.js | 8 +- app/pods/components/hue-controls/component.js | 4 + app/pods/components/hue-controls/template.hbs | 4 +- app/pods/components/huegasm-app/component.js | 2 - app/pods/components/lights-tab/component.js | 4 + app/pods/components/lights-tab/template.hbs | 10 +- app/styles/app.scss | 30 +- .../favicons/android-chrome-144x144.png | Bin 4390 -> 6634 bytes .../favicons/android-chrome-192x192.png | Bin 6235 -> 9662 bytes .../images/favicons/android-chrome-36x36.png | Bin 1351 -> 1512 bytes .../images/favicons/android-chrome-48x48.png | Bin 1573 -> 1894 bytes .../images/favicons/android-chrome-72x72.png | Bin 2099 -> 2847 bytes .../images/favicons/android-chrome-96x96.png | Bin 2714 -> 3879 bytes .../favicons/apple-touch-icon-114x114.png | Bin 3066 -> 4891 bytes .../favicons/apple-touch-icon-120x120.png | Bin 3267 -> 5169 bytes .../favicons/apple-touch-icon-144x144.png | Bin 4044 -> 6634 bytes .../favicons/apple-touch-icon-152x152.png | Bin 4162 -> 7052 bytes .../favicons/apple-touch-icon-180x180.png | Bin 5163 -> 8845 bytes .../favicons/apple-touch-icon-57x57.png | Bin 1694 -> 2195 bytes .../favicons/apple-touch-icon-60x60.png | Bin 1700 -> 2318 bytes .../favicons/apple-touch-icon-72x72.png | Bin 2012 -> 2847 bytes .../favicons/apple-touch-icon-76x76.png | Bin 2072 -> 2960 bytes .../favicons/apple-touch-icon-precomposed.png | Bin 5464 -> 9044 bytes .../images/favicons/apple-touch-icon.png | Bin 5163 -> 8845 bytes .../assets/images/favicons/favicon-16x16.png | Bin 857 -> 750 bytes .../assets/images/favicons/favicon-32x32.png | Bin 1679 -> 1436 bytes .../assets/images/favicons/favicon-96x96.png | Bin 4104 -> 4058 bytes public/assets/images/favicons/favicon.ico | Bin 15086 -> 7406 bytes .../assets/images/favicons/mstile-144x144.png | Bin 6679 -> 6801 bytes .../assets/images/favicons/mstile-150x150.png | Bin 5876 -> 5926 bytes .../assets/images/favicons/mstile-310x150.png | Bin 6156 -> 6368 bytes .../assets/images/favicons/mstile-310x310.png | Bin 14794 -> 15770 bytes .../assets/images/favicons/mstile-70x70.png | Bin 4121 -> 4101 bytes .../images/favicons/safari-pinned-tab.svg | 429 ++---------------- 34 files changed, 74 insertions(+), 417 deletions(-) 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 @@
-