From 165e8f4b4501a8495ca45dd328f073db693d7a34 Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Fri, 16 Oct 2015 13:01:36 -0700 Subject: [PATCH] dimmer switch, labels for settings --- .../components/bridge-finder/template.hbs | 6 +- app/pods/components/groups-list/template.hbs | 8 +- app/pods/components/hue-controls/template.hbs | 22 +++-- app/pods/components/huegasm-app/template.hbs | 2 +- app/pods/components/lights-tab/template.hbs | 12 +-- app/pods/components/music-tab/component.js | 19 +++-- app/pods/components/music-tab/template.hbs | 3 +- app/styles/app.scss | 84 ++++++++++++++----- 8 files changed, 102 insertions(+), 54 deletions(-) diff --git a/app/pods/components/bridge-finder/template.hbs b/app/pods/components/bridge-finder/template.hbs index cbe8b95..39bf998 100644 --- a/app/pods/components/bridge-finder/template.hbs +++ b/app/pods/components/bridge-finder/template.hbs @@ -26,8 +26,10 @@ {{else}} {{#if bridgeFindFail}} -

A hue bridge was not found on your network.
- Enter one manually?

+

A hue bridge could not be automatically found on your network.
+ Enter one manually?

+ ( or enter trial to look around ) +

{{paper-input label="Hue bridge IP address" value=manualBridgeIp}} diff --git a/app/pods/components/groups-list/template.hbs b/app/pods/components/groups-list/template.hbs index 5ff422d..f643ce8 100644 --- a/app/pods/components/groups-list/template.hbs +++ b/app/pods/components/groups-list/template.hbs @@ -1,9 +1,11 @@ -

Light Groups{{paper-icon icon="group-add"}}

- {{#paper-list}} + {{#paper-item}} +

Add a new light group

+ {{/paper-item}} + {{#each groupsArrData as |group|}} {{#paper-item class=group.rowClass}} -
{{group.name}}
{{#if group.deletable}}{{paper-icon icon="close"}}{{/if}} +
{{group.name}}
{{#if group.deletable}}{{paper-icon icon="close"}}{{/if}} {{/paper-item}} {{/each}} {{/paper-list}} diff --git a/app/pods/components/hue-controls/template.hbs b/app/pods/components/hue-controls/template.hbs index 9154bda..e74b49f 100644 --- a/app/pods/components/hue-controls/template.hbs +++ b/app/pods/components/hue-controls/template.hbs @@ -1,34 +1,32 @@ {{#if ready}}
-
+
{{#each tabData as |tab|}} {{tab.name}} {{/each}}
-
- +
+
{{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}} - +
- +
- +
diff --git a/app/pods/components/huegasm-app/template.hbs b/app/pods/components/huegasm-app/template.hbs index 10c5f65..6f94d5d 100644 --- a/app/pods/components/huegasm-app/template.hbs +++ b/app/pods/components/huegasm-app/template.hbs @@ -5,5 +5,5 @@ {{/if}}
-

{{fa-icon "fa-lightbulb-o" classNames=dimmerOnClass}}Made by egorphilippov.me © 2015 Huegasm

+

{{fa-icon "fa-lightbulb-o" classNames=dimmerOnClass}}Made by egorphilippov.me © 2015 Huegasm

\ No newline at end of file diff --git a/app/pods/components/lights-tab/template.hbs b/app/pods/components/lights-tab/template.hbs index 3f55cc6..693f77d 100644 --- a/app/pods/components/lights-tab/template.hbs +++ b/app/pods/components/lights-tab/template.hbs @@ -1,23 +1,23 @@ -{{#paper-list}} +{{#paper-list class="lightsTab"}} {{#paper-item class="item"}} {{light-group lightsData=lightsData activeLights=activeLights action='clickLight' apiURL=apiURL classNames="horizontalLightGroup"}} {{/paper-item}} {{#paper-item}} {{paper-icon icon="power-settings-new"}} -

Power

+

Power

{{#paper-switch checked=lightsOn disabled=trial skipProxy=trial}} {{lightsOnTxt}} {{/paper-switch}} {{/paper-item}} {{#paper-item}} {{paper-icon icon="brightness-4"}} -

Brightness

+

Brightness

{{paper-slider flex=true min='1' max='254' value=lightsBrightness disabled=brightnessControlDisabled}} {{/paper-item}} {{#paper-item action=colorRowAction class="colorRow"}} {{paper-icon icon="color-lens"}} -

Color

+

Color

{{/paper-item}}
@@ -30,13 +30,13 @@ {{#paper-item}} {{paper-icon icon="flare"}} -

Strobe

+

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"}} -

Colorloop

+

Colorloop

{{#paper-switch checked=colorLoopOn disabled=trial skipProxy=trial}} {{colorloopOnTxt}} {{/paper-switch}} {{/paper-item}} {{/paper-list}} \ No newline at end of file diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index 03bda10..c6ab295 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -43,7 +43,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, { if(result.streamable === true){ result.tracks.forEach(processResult); } else { - failedSongs.push(result.title) + failedSongs.push(result.title); } } }, @@ -146,10 +146,15 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, { if(scrollToSong){ var playListArea = Em.$('#playListArea'); + // this is just a bad workaround to make sure that the track has been rendered to the playlist Em.run.later(()=>{ - playListArea.animate({ - scrollTop: Em.$('.track'+index).offset().top - playListArea.offset().top + playListArea.scrollTop() - }); + var track = Em.$('.track'+index); + + if(!Em.isNone(track)) { + playListArea.animate({ + scrollTop: track.offset().top - playListArea.offset().top + playListArea.scrollTop() + }); + } }, 1000); } } @@ -229,7 +234,11 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, { this.get('beatHistory').clear(); if(repeat === 2){ // repeating one song takes precedence over shuffling - nextSong = playQueuePointer; + if(playQueuePointer === -1 && playQueueLength > 0) { + nextSong = 0; + } else { + nextSong = playQueuePointer; + } } else if(shuffle){ var shufflePlayed = this.get('shufflePlayed'); diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs index e73fee0..0ecbb30 100644 --- a/app/pods/components/music-tab/template.hbs +++ b/app/pods/components/music-tab/template.hbs @@ -23,8 +23,7 @@ {{/if}} - {{paper-icon icon="remove-red-eye" class="playerControllIcon"}} - + {{paper-icon icon="remove-red-eye" class="playerControllIcon"}} {{paper-icon icon="fullscreen" class="playerControllIcon"}} diff --git a/app/styles/app.scss b/app/styles/app.scss index f999300..677fe82 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -9,6 +9,7 @@ $playerDefaultIconColor: #BBBBBB; $footerHeight: 40px; $playerBottomHeight: 340px; $secondaryThemeColor: #F12B24; +$glowingText: 0 0 5px #fff, 0 0 10px #fff, 0 0 15px #fff, 0 0 20px #228DFF, 0 0 35px #228DFF, 0 0 40px #228DFF, 0 0 50px #228DFF, 0 0 75px #228DFF; // BRIDGE FINDER html { @@ -22,6 +23,12 @@ body { position: static; } +body.dimmerOn { + .navigationItem { + text-shadow: $glowingText; + } +} + // temporary HAX...not working in FF md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper { transform: none !important; @@ -44,6 +51,9 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper { .settingsItem { margin-left: 15px; position: relative; + display: inline-block; + transition: 0.1s all ease-in-out; + cursor: pointer; } md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-slider[disabled=disabled] { @@ -75,9 +85,14 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli background: darken(white, 20%); } -.settingsItem:hover md-icon.group, -.settingsItem:hover md-icon.settings { - color: black !important; +.settingsItem span:hover { + text-decoration: underline; + md-icon.group { + color: black !important; + } + md-icon.settings { + color: black !important; + } } .ember-app { @@ -90,10 +105,8 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli bottom: 0; width: 100%; height: $footerHeight; - z-index: -1; p { padding-left: 0; - margin-top: 10px; text-align: center; } } @@ -149,9 +162,11 @@ md-progress-linear { background: white; box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, 0.3); width: 210px; - left: -182px; - top: 25px; + left: -172px; + top: 44px; padding: 0; + border: none; + color: black; } .bootstrapTooltip md-icon { @@ -168,6 +183,14 @@ md-list-item .md-no-style { padding: 0; } +.lightsTab * .tooltip { + left: -20px !important; +} + +.colorRow * .tooltip { + left: -7px !important; +} + #hueControls { max-width: 1200px; position: relative; @@ -242,13 +265,15 @@ md-slider.md-default-theme .md-thumb:after { box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, 0.3); border-radius: 0 0 5px 5px; width: 300px; - top: 20px; - left: -269px; + top: 40px; + left: -245px; position: absolute; background-color: white; max-height: 400px; overflow: auto; text-align: left; + padding: 0; + color: black; } .lightGroup { @@ -262,8 +287,6 @@ md-slider.md-default-theme .md-thumb:after { } } -.hueLight {} - .lightInactive { cursor: pointer; position: relative; @@ -317,14 +340,9 @@ md-icon { } .addButton { - .group-add { - color: $secondaryThemeColor; - margin-right: 15px; - font-size: 28px; - } - .group-add:hover { - color: darken(#333333, 5%) !important; - } + width: 100%; + cursor: pointer; + margin-left: 10px; } .removeButton { @@ -360,6 +378,7 @@ md-toolbar { } .groupSelect { + cursor: pointer; padding: 10px 0 10px 10px; width: 70%; font-family: 'Open Sans', sans-serif; @@ -975,16 +994,35 @@ body.dimmerOn { background: #242424; } -md-icon.dimmerOn { +body.dimmerOn #bridgeInput label, +.group.dimmerOn, +.settings.dimmerOn, +.power-settings-new.dimmerOn, +.brightness-4.dimmerOn, +.color-lens.dimmerOn, +.flare.dimmerOn, +.loop.dimmerOn, +.library-music.dimmerOn { color: inherit !important; + text-shadow: $glowingText; + opacity: 1 !important; +} + +body.dimmerOn { + .md-track, .color { + background: white !important; + } } .dimmerWrapper { font-size: 40px; - position: relative; - top: 7px; - margin-right: 20px; + position: absolute; + left: -50px; + bottom: -16px; cursor: pointer; + i.active { + text-shadow: $glowingText; + } } .noUi-value-vertical {