lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixing dimmer bug, slightly better position for playerbottom stuff

Browse source
This commit is contained in:
lone-cloud 2015-10-08 10:55:44 -07:00
parent ed3b488983
commit 4d393bbc52
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/pods/components/music-tab/mixins/music-tab.js
View file

@ -134,9 +134,9 @@ export default Em.Mixin.create({
randomTransition: true, randomTransition: true,
randomTransitionLabel: function() { randomTransitionLabel: function() {
if(this.get('randomTransition')){ if(this.get('randomTransition')){
return 'Random Transition'; return 'Random';
} else { } else {
return 'Sequential Transition'; return 'Sequential';
} }
}.property('randomTransition'), }.property('randomTransition'),
@ -252,7 +252,11 @@ export default Em.Mixin.create({
opacity = 0.8; opacity = 0.8;
} }
this.$('#dimmer').fadeTo(400, opacity); this.$('#dimmer').fadeTo(400, opacity, function() {
if(opacity === 0) {
$(this).hide();
}
});
}.observes('dimmerOn'), }.observes('dimmerOn'),
onSpeakerViewedChange: function(){ onSpeakerViewedChange: function(){

11
app/pods/components/music-tab/template.hbs
View file

@ -124,23 +124,22 @@
</div> </div>
<div id="beatOptionButtonGroup" class="row"> <div id="beatOptionButtonGroup" class="row">
<div class="beatOption col-xs-6"> <div class="beatOption col-xs-3">
{{#paper-button raised=true warn=true action="defaultControls"}}Default{{/paper-button}}
</div>
<div class="beatOption col-xs-4">
{{#paper-switch checked=randomTransition disabled=trial}}<span data-toggle="tooltip" {{#paper-switch checked=randomTransition disabled=trial}}<span data-toggle="tooltip"
data-placement="bottom auto" data-placement="bottom auto"
data-title="The transition order of lights on beat" data-title="The transition order of lights on beat"
class="optionDescription bootstrapTooltip">{{randomTransitionLabel}}</span>{{/paper-switch}} class="optionDescription bootstrapTooltip">{{randomTransitionLabel}}</span>{{/paper-switch}}
</div> </div>
<div class="beatOption col-xs-6"> <div class="beatOption col-xs-5">
{{#paper-switch checked=onBeatBriAndColor disabled=trial}}<span data-toggle="tooltip" {{#paper-switch checked=onBeatBriAndColor disabled=trial}}<span data-toggle="tooltip"
data-placement="bottom auto" data-placement="bottom auto"
data-title="The properties of the lights to change on beat" data-title="The properties of the lights to change on beat"
class="optionDescription bootstrapTooltip"> {{onBeatBriAndColorLabel}}</span>{{/paper-switch}} class="optionDescription bootstrapTooltip"> {{onBeatBriAndColorLabel}}</span>{{/paper-switch}}
</div> </div>
</div> </div>
<div id="playerButtonGroup" class="row">
{{#paper-button raised=true warn=true action="defaultControls"}}Default{{/paper-button}}
</div>
</div> </div>
<div id="beatContainer" class="col-sm-5 col-xs-12"> <div id="beatContainer" class="col-sm-5 col-xs-12">

9
app/styles/app.scss
View file

@ -7,7 +7,7 @@ $playerBackColor: #F12B24;
$playerHeight: 400px; $playerHeight: 400px;
$playerDefaultIconColor: #BBBBBB; $playerDefaultIconColor: #BBBBBB;
$footerHeight: 40px; $footerHeight: 40px;
$playerBottomHeight: 380px; $playerBottomHeight: 340px;
// BRIDGE FINDER // BRIDGE FINDER
html { html {
@ -707,6 +707,9 @@ md-switch.md-default-theme.md-checked .md-thumb {
.optionDescription { .optionDescription {
font-size: 13px; font-size: 13px;
} }
button {
margin-top: 0;
}
} }
#playerBottom { #playerBottom {
@ -714,7 +717,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
border: 1px solid black; border: 1px solid black;
width: 100%; width: 100%;
background: white; background: white;
height: $playerBottomHeight;
} }
#beatContainer { #beatContainer {
@ -722,10 +724,9 @@ md-switch.md-default-theme.md-checked .md-thumb {
padding: 0; padding: 0;
height: $playerBottomHeight; height: $playerBottomHeight;
md-switch { md-switch {
bottom: 0; top: 0;
position: absolute; position: absolute;
margin-left: 0; margin-left: 0;
z-index: 3;
margin-bottom: 10px; margin-bottom: 10px;
} }
} }