A few formatting and trial changes
This commit is contained in:
parent
308acd58e8
commit
80a57e9fff
10 changed files with 35 additions and 30 deletions
|
|
@ -85,5 +85,9 @@ export default Em.Component.extend({
|
|||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
ready: function() {
|
||||
return this.get('trial') || !Em.isNone(this.get('lightsData'));
|
||||
}.property('lightsData', 'trial')
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import Em from 'ember';
|
||||
|
||||
export default Em.Component.extend({
|
||||
classNames: ['container', 'center-block'],
|
||||
classNames: ['container'],
|
||||
elementId: 'finderContainer',
|
||||
|
||||
bridgeIp: null,
|
||||
|
|
|
|||
|
|
@ -1,4 +1,7 @@
|
|||
import Em from 'ember';
|
||||
|
||||
export default Em.Component.extend({
|
||||
tagName: 'footer',
|
||||
|
||||
classNames: ['footer']
|
||||
});
|
||||
|
|
|
|||
|
|
@ -10,7 +10,13 @@ $playListBackgroundColor: #1E1E1E;
|
|||
$playerDefaultIconColor: #BBBBBB;
|
||||
|
||||
// BRIDGE FINDER
|
||||
.footer .container {
|
||||
.footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.footer .text-muted {
|
||||
padding-left: 0;
|
||||
margin-top: 30px;
|
||||
text-align: center;
|
||||
|
|
@ -22,7 +28,7 @@ $playerDefaultIconColor: #BBBBBB;
|
|||
|
||||
#finderContainer {
|
||||
text-align: center;
|
||||
margin-top: 40px;
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
#finderContainer .title {
|
||||
|
|
@ -37,18 +43,13 @@ $playerDefaultIconColor: #BBBBBB;
|
|||
margin: 0 auto;
|
||||
}
|
||||
}
|
||||
|
||||
#finderContainer p {
|
||||
padding-top: 50px;
|
||||
}
|
||||
|
||||
md-progress-circular {
|
||||
margin: 0 auto;
|
||||
margin: 0 auto 20px auto !important;
|
||||
}
|
||||
|
||||
#pressButtonBridgeImg {
|
||||
width: 200px;
|
||||
margin: 0 auto 0 auto;
|
||||
margin: 0 auto 30px auto;
|
||||
display: inherit;
|
||||
}
|
||||
|
||||
|
|
@ -440,9 +441,9 @@ md-toolbar {
|
|||
|
||||
#vertDivider {
|
||||
position: absolute;
|
||||
right: 40px;
|
||||
right: 2.857em;
|
||||
top: 25%;
|
||||
width: 1px;
|
||||
width: 0.071em;
|
||||
height: 50%;
|
||||
background-color: white;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{{#liquid-if lightsData}}
|
||||
{{#if ready}}
|
||||
|
||||
{{#paper-nav-container class="ember-app"}}
|
||||
|
||||
|
|
@ -19,16 +19,13 @@
|
|||
</div>
|
||||
|
||||
{{#liquid-if lightsTabSelected class="tabSwitch"}}
|
||||
{{controls/light-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
|
||||
{{controls/light-control apiURL=apiURL lightsData=lightsData activeLights=activeLights trial=trial}}
|
||||
{{/liquid-if}}
|
||||
|
||||
{{#liquid-if musicTabSelected class="tabSwitch"}}
|
||||
{{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
|
||||
{{/liquid-if}}
|
||||
|
||||
{{huegasm-footer}}
|
||||
{{/paper-content}}
|
||||
|
||||
{{/paper-nav-container}}
|
||||
|
||||
{{huegasm-footer}}
|
||||
{{/liquid-if}}
|
||||
{{/if}}
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
<span id="bridgeInput">
|
||||
{{paper-input label="Hue Bridge IP Address" value=manualBridgeIp}}
|
||||
{{#paper-button action="findBridgeByIp" primary=true }}Find{{/paper-button}}
|
||||
{{#paper-button action="findBridgeByIp" primary=true}}Find{{/paper-button}}
|
||||
</span>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
{{#paper-item class="item"}}
|
||||
{{paper-icon icon="power-settings-new"}}
|
||||
<p>Lights</p>
|
||||
{{#paper-switch checked=lightsOn}} {{lightsOnTxt}} {{/paper-switch}}
|
||||
{{#paper-switch checked=lightsOn disabled=trial}} {{lightsOnTxt}} {{/paper-switch}}
|
||||
{{/paper-item}}
|
||||
|
||||
{{#paper-item class="item"}}
|
||||
|
|
@ -19,9 +19,8 @@
|
|||
{{#paper-item class="item"}}
|
||||
{{paper-icon icon="flare"}}
|
||||
<p>Strobe</p>
|
||||
{{#paper-switch checked=strobeOn}} {{strobeOnTxt}} {{/paper-switch}}
|
||||
{{#paper-switch checked=strobeOn disabled=trial}} {{strobeOnTxt}} {{/paper-switch}}
|
||||
{{/paper-item}}
|
||||
|
||||
{{modals/light-control-modal modalData=modalData apiURL=apiURL action="clickLight" isShowingLightsModal=isShowingLightsModal}}
|
||||
|
||||
{{/paper-list}}
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
{{bridge-controls bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
|
||||
{{else}}
|
||||
{{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
|
||||
{{huegasm-footer}}
|
||||
{{/liquid-if}}
|
||||
|
||||
{{#unless bridgeUsername}}
|
||||
{{huegasm-footer}}
|
||||
{{/unless}}
|
||||
|
|
|
|||
|
|
@ -1,5 +1 @@
|
|||
<footer class="footer">
|
||||
<div class="container">
|
||||
<p class="text-muted">Made with ¯\_(ツ)_/¯ by <a href="//egorphilippov.me">egorphilippov.me</a> © 2015 Huegasm</p>
|
||||
</div>
|
||||
</footer>
|
||||
<p class="text-muted">Made with ¯\_(ツ)_/¯ by <a href="//egorphilippov.me">egorphilippov.me</a> © 2015 Huegasm</p>
|
||||
|
|
@ -16,5 +16,8 @@
|
|||
"loader.js": "ember-cli/loader.js#3.2.0",
|
||||
"nouislider": "^8.0.1",
|
||||
"qunit": "~1.18.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"ember": "~2.0.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue