humans.txt, SC image on SC songs, minor styling
This commit is contained in:
parent
eb1ffca5ec
commit
a7ae51c616
10 changed files with 70 additions and 10 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
{{#paper-list}}
|
{{#paper-list}}
|
||||||
{{#paper-item class="newGroupRow"}}
|
{{#paper-item class="newGroupRow"}}
|
||||||
<div class="newGroup" {{action "toggleAddGroupsModal"}}>Add a new light group</div>
|
<div class="newGroup" {{action "toggleAddGroupsModal"}}>Add a new group</div>
|
||||||
{{/paper-item}}
|
{{/paper-item}}
|
||||||
|
|
||||||
{{#each groupsArrData as |group|}}
|
{{#each groupsArrData as |group|}}
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,7 @@
|
||||||
|
|
||||||
<div id="settings" class="col-sm-3 col-xs-4">
|
<div id="settings" class="col-sm-3 col-xs-4">
|
||||||
<div class="settingsItem">
|
<div class="settingsItem">
|
||||||
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Groups <span class="caret"></span>
|
||||||
Light Groups <span class="caret"></span>
|
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
{{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}}
|
{{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}}
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,18 @@ export default Em.Component.extend({
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
clickLight(id, data){
|
clickLight(id, data){
|
||||||
|
var light = Em.$(event.target);
|
||||||
|
|
||||||
|
if(!light.hasClass('bootstrapTooltip')){
|
||||||
|
light = light.parent();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(light.hasClass('lightInactive')){
|
||||||
|
light.addClass('lightActive').removeClass('lightInactive');
|
||||||
|
} else if(light.hasClass('lightActive')){
|
||||||
|
light.addClass('lightInactive').removeClass('lightActive');
|
||||||
|
}
|
||||||
|
|
||||||
this.sendAction('action', id, data);
|
this.sendAction('action', id, data);
|
||||||
},
|
},
|
||||||
lightStartHover(id){
|
lightStartHover(id){
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
gotoURL(URL){
|
gotoURL(URL){
|
||||||
|
Em.$('.tooltip').remove();
|
||||||
window.open(URL, '_blank');
|
window.open(URL, '_blank');
|
||||||
},
|
},
|
||||||
handleNewSoundCloudURL(URL){
|
handleNewSoundCloudURL(URL){
|
||||||
|
|
@ -35,7 +36,7 @@ export default Em.Component.extend(musicControlMixin, visualizerMixin, {
|
||||||
picture = result.user.avatar_url;
|
picture = result.user.avatar_url;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.get('playQueue').pushObject({url: result.stream_url + '?client_id=' + this.get('SC_CLIENT_ID'), fileName: result.title + ' - ' + result.user.username, artist: result.user.username, artistUrl: result.user.permalink_url, title: result.title, artworkUrl: result.artwork_url, picture: picture });
|
this.get('playQueue').pushObject({url: result.stream_url + '?client_id=' + this.get('SC_CLIENT_ID'), fileName: result.title + ' - ' + result.user.username, artist: result.user.username, scUrl: result.permalink_url, title: result.title, artworkUrl: result.artwork_url, picture: picture });
|
||||||
} else {
|
} else {
|
||||||
failedSongs.push(result.title);
|
failedSongs.push(result.title);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -107,6 +107,17 @@ export default Em.Mixin.create({
|
||||||
return '<div class="alert alert-danger" role="alert">Failed to play file ( ' + fileName + ' ).</div>';
|
return '<div class="alert alert-danger" role="alert">Failed to play file ( ' + fileName + ' ).</div>';
|
||||||
},
|
},
|
||||||
|
|
||||||
|
scUrl: function(){
|
||||||
|
var rtn = null,
|
||||||
|
currentSong = this.get('playQueue')[this.get('playQueuePointer')];
|
||||||
|
|
||||||
|
if(currentSong && currentSong.scUrl){
|
||||||
|
rtn = currentSong.scUrl;
|
||||||
|
}
|
||||||
|
|
||||||
|
return rtn;
|
||||||
|
}.property('playQueuePointer', 'playQueue.[]'),
|
||||||
|
|
||||||
playQueueEmpty: Em.computed.empty('playQueue'),
|
playQueueEmpty: Em.computed.empty('playQueue'),
|
||||||
playQueueNotEmpty: Em.computed.notEmpty('playQueue'),
|
playQueueNotEmpty: Em.computed.notEmpty('playQueue'),
|
||||||
playQueueMultiple: function(){
|
playQueueMultiple: function(){
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,14 @@
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
|
||||||
<span class="pull-right">
|
<span class="pull-right">
|
||||||
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Visualizations" {{action "toggleVisualizations"}}>{{paper-icon icon="remove-red-eye" class="playerControllIcon"}}</span>
|
{{#if scUrl}}
|
||||||
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Full screen" {{action "fullscreen"}}>{{paper-icon icon="fullscreen" class="playerControllIcon"}}
|
<a href="#" data-toggle="tooltip" data-placement="top" class="soundCloudLink bootstrapTooltip" data-title="Listen on SoundCloud" {{action "gotoURL" scUrl}}>
|
||||||
</span>
|
<img src="assets/images/sc-white.png" />
|
||||||
</span>
|
</a>
|
||||||
|
{{/if}}
|
||||||
|
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Visualizations" {{action "toggleVisualizations"}}>{{paper-icon icon="remove-red-eye" class="playerControllIcon"}}</span>
|
||||||
|
<span data-toggle="tooltip" data-placement="top" class="bootstrapTooltip" data-title="Full screen" {{action "fullscreen"}}>{{paper-icon icon="fullscreen" class="playerControllIcon"}}</span>
|
||||||
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,6 +41,7 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
z-index: 3;
|
z-index: 3;
|
||||||
|
font-size:16px
|
||||||
}
|
}
|
||||||
|
|
||||||
.settingsItem {
|
.settingsItem {
|
||||||
|
|
@ -412,6 +413,7 @@ md-toolbar {
|
||||||
}
|
}
|
||||||
|
|
||||||
.close {
|
.close {
|
||||||
|
font-size: 18px !important;
|
||||||
color: rgb(51, 51, 51);
|
color: rgb(51, 51, 51);
|
||||||
display: none;
|
display: none;
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
|
|
@ -458,7 +460,7 @@ md-switch.md-default-theme.md-checked .md-thumb {
|
||||||
z-index: 20;
|
z-index: 20;
|
||||||
background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.7));
|
background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.7));
|
||||||
.tooltip.top {
|
.tooltip.top {
|
||||||
margin-top: -15px;
|
margin-top: -17px;
|
||||||
}
|
}
|
||||||
.tooltip-arrow {
|
.tooltip-arrow {
|
||||||
display: none;
|
display: none;
|
||||||
|
|
@ -866,6 +868,19 @@ body.dimmerOn {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.dimmerWrapper:hover i {
|
||||||
|
animation: neon 1.5s ease-in-out infinite alternate;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes neon {
|
||||||
|
from {
|
||||||
|
text-shadow: 0 0 10px #fff, 0 0 20px #fff, 0 0 30px #fff, 0 0 40px #228DFF, 0 0 70px #228DFF, 0 0 80px #228DFF, 0 0 100px #228DFF, 0 0 150px #228DFF;
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
text-shadow: 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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.noUi-value-vertical {
|
.noUi-value-vertical {
|
||||||
margin-top: -10px;
|
margin-top: -10px;
|
||||||
}
|
}
|
||||||
|
|
@ -928,3 +943,7 @@ button.md-warn {
|
||||||
.addNewMusic:hover {
|
.addNewMusic:hover {
|
||||||
background: linear-gradient(lighten(#db8e01,5%), lighten(#871e0a,5%));
|
background: linear-gradient(lighten(#db8e01,5%), lighten(#871e0a,5%));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.soundCloudLink {
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
|
|
|
||||||
BIN
public/assets/images/sc-white.png
Normal file
BIN
public/assets/images/sc-white.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
14
public/humans.txt
Normal file
14
public/humans.txt
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
/* TEAM */
|
||||||
|
Your title: Egor Philippov
|
||||||
|
Site: https://www.linkedin.com/pub/egor-philippov/7b/220/148
|
||||||
|
Location: Vancouver, Canada.
|
||||||
|
|
||||||
|
|
||||||
|
/* THANKS */
|
||||||
|
Name: Edmond Cheung
|
||||||
|
|
||||||
|
|
||||||
|
/* SITE */
|
||||||
|
Last update: 2015
|
||||||
|
Standards: HTML5, CSS3
|
||||||
|
Components: ember, jQuery, bootstrap, font-awesome, three.js, intro.js, locallyjs, nouislider, dancer.js, jquery-mousewheel, ember paper, ember notify, JavaScript-ID3-Reader
|
||||||
Reference in a new issue