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

latest push

Browse source
This commit is contained in:
lone-cloud 2015-10-16 14:35:12 -07:00
parent 165e8f4b45
commit 1bd63a4ed7
3 changed files with 40 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/pods/components/groups-list/template.hbs
View file

@ -1,5 +1,5 @@
{{#paper-list}}
{{#paper-item}}
{{#paper-item class="groupRow"}}
<h4 class="addButton" {{action "toggleAddGroupsModal"}}>Add a new light group</h4>
{{/paper-item}}

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

@ -35,8 +35,15 @@
<div id="playListControls">
{{#if usingLocalAudio}}
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Add local music" class="pull-right bootstrapTooltip" {{action "addLocalAudio"}}>{{paper-icon icon="add" class="playerControllIcon"}}</span>
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Add music from SoundCloud" class="pull-right bootstrapTooltip soundCloudLogoIcon" {{action "toggleIsShowingAddSoundCloudModal"}}>{{fa-icon "soundcloudWorkaround" classNames="playerControllIcon"}}</span>
<button class="btn btn-default dropdown-toggle pull-right" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Add new music
<span class="caret"></span>
</button>
<ul id="addMusicChoices" class="dropdown-menu">
<li><a href="#" {{action "addLocalAudio"}}>Local</a></li>
<li><a href="#" {{action "toggleIsShowingAddSoundCloudModal"}}>SoundCloud</a></li>
</ul>
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="shuffleTooltip" data-title={{shuffleTooltipTxt}} {{action "shuffleChanged"}}>{{paper-icon icon="shuffle" class=shuffleClass}}</span>
<span data-toggle="tooltip" data-placement="bottom auto" class="bootstrapTooltip" id="repeatTooltip" data-title={{repeatTooltipTxt}} {{action "repeatChanged"}}>{{paper-icon icon=repeatIcon class=repeatClass}}</span>
@ -75,19 +82,18 @@
{{#if item.title}}
<div class="songTitle">{{item.title}}</div>
<div class="songArtist">
{{#if item.artistUrl}}
<a href="#" {{action "gotoURL" item.artistUrl bubbles=false}}>{{item.artist}}</a>
{{else}}
{{item.artist}}
{{/if}}
</div>
{{#if item.artistUrl}}
<a href="#" {{action "gotoURL" item.artistUrl bubbles=false}}>{{item.artist}}</a>
{{else}}
{{item.artist}}
{{/if}}
</div>
{{else}}
{{item.filename}}
{{/if}}
</div>
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Remove" data-container="body" class="audioRemoveButton cursorPointer bootstrapTooltip" {{action "removeAudio" index bubbles=false}}>{{paper-icon icon="close"}}
</span>
<span data-toggle="tooltip" data-placement="bottom auto" data-title="Remove" data-container="body" class="audioRemoveButton cursorPointer bootstrapTooltip" {{action "removeAudio" index bubbles=false}}>{{paper-icon icon="close"}}</span>
</div>
{{/each}}
</div>

42
app/styles/app.scss
View file

@ -370,7 +370,7 @@ md-toolbar {
}
.groupRow:hover {
background-color: #c3c3c3;
background-color: #DEDEDE;
}
.groupRow.selectedRow .groupSelect {
@ -449,7 +449,7 @@ md-switch.md-default-theme.md-checked .md-thumb {
position: absolute;
bottom: 0;
left: 0;
padding: 0.714em;
padding: 5px 10px;
width: 100%;
color: white !important;
z-index: 20;
@ -460,6 +460,9 @@ md-switch.md-default-theme.md-checked .md-thumb {
.tooltip-arrow {
display: none;
}
.play-arrow, .pause {
font-size: 30px;
}
}
#playerTimeControls {
@ -467,8 +470,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
font-size: 14px;
display: inline-block;
margin-left: 1em;
position: relative;
bottom: 2px;
}
.playerControllIcon {
@ -547,7 +548,6 @@ md-switch.md-default-theme.md-checked .md-thumb {
width: 5em;
height: 0.4em;
display: inline-block;
margin-bottom: 3px;
}
.noUi-handle {
@ -602,6 +602,7 @@ md-switch.md-default-theme.md-checked .md-thumb {
min-height: 30px;
margin-top: 5px;
border-bottom: 1px solid #3a3a3a;
position: relative;
}
#playListArea, #playAreaMic, #playAreaYoutube {
@ -1055,20 +1056,23 @@ button.md-warn {
background: $secondaryThemeColor;
}
.#{$fa-css-prefix}-soundcloudWorkaround:before {
content: $fa-var-soundcloud;
}
.soundCloudLogoIcon {
line-height: 34px;
i {
font-size: 26px;
cursor: pointer;
line-height: 0;
color: #f70 !important;
}
}
.ember-modal-dialog {
padding: 20px;
}
.addMusicButton {
float: right;
color: white;
}
#addMusicChoices {
min-width: initial;
right: 0;
left: initial;
width: 100px;
top: 28px;
}
.dropdown-toggle {
padding: 4px;
}