From 1b2635f6c4581584bd5476f66dc9ffb04096a4c4 Mon Sep 17 00:00:00 2001 From: Egor! Date: Wed, 12 Oct 2016 13:52:05 -0700 Subject: [PATCH] fixing bugs caused by modernization, move component to sub-components in the pod structure, comment more bootstrap modules, move over the ember-notify.css to the project --- web/app/index.html | 16 +++ .../components/bridge-finder/component.js | 2 +- .../components/bridge-finder/template.hbs | 4 +- .../add-group-modal/component.js | 0 .../add-group-modal/template.hbs | 0 .../delete-group-modal/component.js | 0 .../delete-group-modal/template.hbs | 0 .../pods/components/groups-list/template.hbs | 4 +- .../pods/components/hue-controls/template.hbs | 2 +- .../pods/components/huegasm-app/template.hbs | 2 +- .../color-picker/component.js | 0 .../color-picker/template.hbs | 0 .../pods/components/lights-tab/template.hbs | 2 +- .../add-soundcloud-sound-modal/component.js | 0 .../add-soundcloud-sound-modal/template.hbs | 2 +- .../pods/components/music-tab/component.js | 9 +- .../components/music-tab/mixins/helpers.js | 8 +- .../pods/components/music-tab/template.hbs | 109 ++++++++++-------- web/app/styles/app.scss | 6 +- web/app/styles/bootstrap.scss | 36 +++--- web/app/styles/bridge-finder.scss | 56 +++++++++ web/app/styles/ember-notify.scss | 102 ++++++++++++++++ web/app/styles/fancy-speaker.scss | 2 + web/app/styles/huegasm-variables.scss | 2 +- web/app/styles/index.scss | 53 --------- web/app/styles/music-tab.scss | 18 +-- web/app/styles/noui-slider.scss | 2 +- 27 files changed, 286 insertions(+), 151 deletions(-) rename web/app/pods/components/{ => groups-list}/add-group-modal/component.js (100%) rename web/app/pods/components/{ => groups-list}/add-group-modal/template.hbs (100%) rename web/app/pods/components/{ => groups-list}/delete-group-modal/component.js (100%) rename web/app/pods/components/{ => groups-list}/delete-group-modal/template.hbs (100%) rename web/app/pods/components/{ => lights-tab}/color-picker/component.js (100%) rename web/app/pods/components/{ => lights-tab}/color-picker/template.hbs (100%) rename web/app/pods/components/{ => music-tab}/add-soundcloud-sound-modal/component.js (100%) rename web/app/pods/components/{ => music-tab}/add-soundcloud-sound-modal/template.hbs (78%) create mode 100644 web/app/styles/ember-notify.scss delete mode 100644 web/app/styles/index.scss diff --git a/web/app/index.html b/web/app/index.html index 6c8a585..f5544b6 100644 --- a/web/app/index.html +++ b/web/app/index.html @@ -9,6 +9,22 @@ + + + + + + + + + {{content-for 'head'}} diff --git a/web/app/pods/components/bridge-finder/component.js b/web/app/pods/components/bridge-finder/component.js index c25cd11..588796e 100644 --- a/web/app/pods/components/bridge-finder/component.js +++ b/web/app/pods/components/bridge-finder/component.js @@ -10,7 +10,7 @@ const { } = Ember; export default Component.extend({ - classNames: ['container', 'bridgeFinder'], + classNames: ['container', 'bridge-finder'], bridgeIp: null, trial: false, bridgeUsername: null, diff --git a/web/app/pods/components/bridge-finder/template.hbs b/web/app/pods/components/bridge-finder/template.hbs index 088f0a7..a6ec041 100644 --- a/web/app/pods/components/bridge-finder/template.hbs +++ b/web/app/pods/components/bridge-finder/template.hbs @@ -3,8 +3,8 @@ {{#if bridgeIp}} {{#if error}}

Huegasm encountered a critical error while trying to connect to your bridge.

- This likely happened because you're using an outdated browser and/or because your browser does not support CORS. Feel free to contact me through the link at the bottom of the page if you feel like this is not the case.
- For the best browsing experience on this site ( and every other one known to man ) please switch to Google Chrome or Firefox

. + This likely happened because you're using an outdated browser and/or because your browser does not support CORS. Feel free to contact me through the link at the bottom of the page if you feel like this is not the case.
+ For the best browsing experience on this site ( and every other one known to man ) please switch to Google Chrome or Firefox

. {{else}} {{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}} diff --git a/web/app/pods/components/add-group-modal/component.js b/web/app/pods/components/groups-list/add-group-modal/component.js similarity index 100% rename from web/app/pods/components/add-group-modal/component.js rename to web/app/pods/components/groups-list/add-group-modal/component.js diff --git a/web/app/pods/components/add-group-modal/template.hbs b/web/app/pods/components/groups-list/add-group-modal/template.hbs similarity index 100% rename from web/app/pods/components/add-group-modal/template.hbs rename to web/app/pods/components/groups-list/add-group-modal/template.hbs diff --git a/web/app/pods/components/delete-group-modal/component.js b/web/app/pods/components/groups-list/delete-group-modal/component.js similarity index 100% rename from web/app/pods/components/delete-group-modal/component.js rename to web/app/pods/components/groups-list/delete-group-modal/component.js diff --git a/web/app/pods/components/delete-group-modal/template.hbs b/web/app/pods/components/groups-list/delete-group-modal/template.hbs similarity index 100% rename from web/app/pods/components/delete-group-modal/template.hbs rename to web/app/pods/components/groups-list/delete-group-modal/template.hbs diff --git a/web/app/pods/components/groups-list/template.hbs b/web/app/pods/components/groups-list/template.hbs index 2181ab4..1bf0f09 100644 --- a/web/app/pods/components/groups-list/template.hbs +++ b/web/app/pods/components/groups-list/template.hbs @@ -10,6 +10,6 @@ {{/each}} {{/paper-list}} -{{add-group-modal lightsData=lightsData groupsData=groupsData isShowingModal=isShowingAddGroupsModal apiURL=apiURL updateGroupsData=updateGroupsData action="toggleAddGroupsModal"}} +{{groups-list/add-group-modal lightsData=lightsData groupsData=groupsData isShowingModal=isShowingAddGroupsModal apiURL=apiURL updateGroupsData=updateGroupsData action="toggleAddGroupsModal"}} -{{delete-group-modal groupName=deleteGroupName groupId=deleteGroupId groupsData=groupsData isShowingModal=isShowingConfirmDeleteModal apiURL=apiURL updateGroupsData=updateGroupsData groupIdSelection=groupIdSelection action="toggleConfirmDeleteGroupsModal"}} \ No newline at end of file +{{groups-list/delete-group-modal groupName=deleteGroupName groupId=deleteGroupId groupsData=groupsData isShowingModal=isShowingConfirmDeleteModal apiURL=apiURL updateGroupsData=updateGroupsData groupIdSelection=groupIdSelection action="toggleConfirmDeleteGroupsModal"}} \ No newline at end of file diff --git a/web/app/pods/components/hue-controls/template.hbs b/web/app/pods/components/hue-controls/template.hbs index df7711b..75d225f 100644 --- a/web/app/pods/components/hue-controls/template.hbs +++ b/web/app/pods/components/hue-controls/template.hbs @@ -28,7 +28,7 @@ - {{lights-tab apiURL=apiURL lightsData=lightsData activeLights=activeLights trial=trial active=lights-tabSelected colorLoopOn=colorLoopOn dimmerOn=dimmerOn}} + {{lights-tab apiURL=apiURL lightsData=lightsData activeLights=activeLights trial=trial active=lightsTabSelected colorLoopOn=colorLoopOn dimmerOn=dimmerOn}} {{music-tab apiURL=apiURL lightsData=lightsData activeLights=activeLights active=musicTabSelected pauseLightUpdates=pauseLightUpdates dimmerOn=dimmerOn storage=storage colorLoopOn=colorLoopOn action="startIntro"}} {{/if}} \ No newline at end of file diff --git a/web/app/pods/components/huegasm-app/template.hbs b/web/app/pods/components/huegasm-app/template.hbs index 0ce5de8..67898ad 100644 --- a/web/app/pods/components/huegasm-app/template.hbs +++ b/web/app/pods/components/huegasm-app/template.hbs @@ -31,7 +31,7 @@ © {{year}} - + Egor Philippov diff --git a/web/app/pods/components/color-picker/component.js b/web/app/pods/components/lights-tab/color-picker/component.js similarity index 100% rename from web/app/pods/components/color-picker/component.js rename to web/app/pods/components/lights-tab/color-picker/component.js diff --git a/web/app/pods/components/color-picker/template.hbs b/web/app/pods/components/lights-tab/color-picker/template.hbs similarity index 100% rename from web/app/pods/components/color-picker/template.hbs rename to web/app/pods/components/lights-tab/color-picker/template.hbs diff --git a/web/app/pods/components/lights-tab/template.hbs b/web/app/pods/components/lights-tab/template.hbs index d04f58e..1899123 100644 --- a/web/app/pods/components/lights-tab/template.hbs +++ b/web/app/pods/components/lights-tab/template.hbs @@ -24,7 +24,7 @@ {{#paper-button raised=true class="color" action="toggleColorPicker" disabled=trial}}{{/paper-button}} {{#if colorPickerDisplayed}} - {{color-picker lightsData=lightsData activeLights=activeLights rgb=rgb}} + {{lights-tab/color-picker lightsData=lightsData activeLights=activeLights rgb=rgb}} {{/if}} diff --git a/web/app/pods/components/add-soundcloud-sound-modal/component.js b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/component.js similarity index 100% rename from web/app/pods/components/add-soundcloud-sound-modal/component.js rename to web/app/pods/components/music-tab/add-soundcloud-sound-modal/component.js diff --git a/web/app/pods/components/add-soundcloud-sound-modal/template.hbs b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs similarity index 78% rename from web/app/pods/components/add-soundcloud-sound-modal/template.hbs rename to web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs index 74f38df..426fd42 100644 --- a/web/app/pods/components/add-soundcloud-sound-modal/template.hbs +++ b/web/app/pods/components/music-tab/add-soundcloud-sound-modal/template.hbs @@ -1,7 +1,7 @@ {{#if isShowingModal}} {{#modal-dialog close="close" alignment="center" translucentOverlay=true attachment="center" targetAttachment="center"}} -

Enter a SoundCloud track or playlist/set URL

+

Enter a SoundCloud track or playlist/set URL

( ex. https://soundcloud.com/mrsuicidesheep/tracks )

{{paper-input label="SoundCloud URL" icon="search" value=url}} diff --git a/web/app/pods/components/music-tab/component.js b/web/app/pods/components/music-tab/component.js index e72c996..d18cb60 100644 --- a/web/app/pods/components/music-tab/component.js +++ b/web/app/pods/components/music-tab/component.js @@ -466,7 +466,12 @@ export default Component.extend(helperMixin, visualizerMixin, { 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, scUrl: result.permalink_url, title: result.title, artworkUrl: result.artwork_url, picture: picture }); + $.get(picture) + .done(()=>{ + 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, picture: picture }); + }).fail(()=>{ // no 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 }); + }); } else { failedSongs.push(result.title); } @@ -617,7 +622,7 @@ export default Component.extend(helperMixin, visualizerMixin, { let track = $('.track'+index); if(!isNone(track) && !isNone(track.offset())) { - track.velocity('scroll'); + track.velocity('scroll', { container: $('#play-list-area') }); } }, 1000); } diff --git a/web/app/pods/components/music-tab/mixins/helpers.js b/web/app/pods/components/music-tab/mixins/helpers.js index 6915607..50c9a53 100644 --- a/web/app/pods/components/music-tab/mixins/helpers.js +++ b/web/app/pods/components/music-tab/mixins/helpers.js @@ -138,10 +138,14 @@ export default Mixin.create({ // used to insure that we don't replay the same thing multiple times in shuffle mode shufflePlayed: [], + // noUiSlider connection specification + filledConnect: [true, false], + hueRangeConnect: [false, true, false], + SC_CLIENT_ID: 'aeec0034f58ecd85c2bd1deaecc41594', notFoundHtml: '', scUserNotSupportedHtml: '', - tooManySoundCloudFuckUps: '', + tooManySoundCloudFuckUps: '', notStreamableHtml(fileNames){ let html = ''; @@ -194,7 +198,7 @@ export default Mixin.create({ if(playQueuePointer !== -1 && !usingMicAudio && currentVisName === 'None'){ let song = playQueue[playQueuePointer]; - if(song.scUrl){ + if(song.scUrl && !isNone(song.picture)){ pic = song.picture.replace('67x67', '500x500'); } else { pic = song.picture; diff --git a/web/app/pods/components/music-tab/template.hbs b/web/app/pods/components/music-tab/template.hbs index c0d6308..01192d7 100644 --- a/web/app/pods/components/music-tab/template.hbs +++ b/web/app/pods/components/music-tab/template.hbs @@ -6,7 +6,7 @@
{{#if usingLocalAudio}} - {{range-slider start=seekPosition min=0 max=100 id="seek-slider" slide="seekChanged"}} + {{range-slider start=seekPosition min=0 max=100 connect=filledConnect id="seek-slider" on-slide="seekChanged"}} {{#if playQueueNotEmpty}} {{/if}}{{paper-icon icon=volumeIcon class=volumeMutedClass}}{{range-slider start=volume min=0 max=100 slide="volumeChanged" id="volume-bar" class="hidden-xs"}} + -->{{range-slider start=volume min=0 max=100 connect=filledConnect on-slide="volumeChanged" id="volume-bar" class="hidden-xs"}}
{{timeElapsedTxt}} / {{timeTotalTxt}}
{{/if}} @@ -141,67 +141,74 @@
-
-{{#if usingBeatPreferences}} - - {{paper-icon class=dimmerOnClass icon="star"}} - -{{/if}} +
+ {{#if usingBeatPreferences}} + + {{paper-icon class=dimmerOnClass icon="star"}} + + {{/if}} -
-
- Sensitivity - {{range-slider start=threshold orientation="vertical" step=beatOptions.threshold.step range=beatOptions.threshold.range slide="thresholdChanged" pips=beatOptions.threshold.pips}} -
- -
- Hue Range - {{range-slider start=hueRange orientation="vertical" step=beatOptions.hueRange.step range=beatOptions.hueRange.range slide="hueRangeChanged" pips=beatOptions.hueRange.pips}} -
- - {{#if usingMicAudio}} +
- Mic Boost - {{range-slider start=micBoost orientation="vertical" step=beatOptions.micBoost.step range=beatOptions.micBoost.range slide="micBoostChanged" pips=beatOptions.micBoost.pips}} + + Sensitivity + + + {{range-slider start=threshold orientation="vertical" step=beatOptions.threshold.step range=beatOptions.threshold.range on-slide="thresholdChanged" pips=beatOptions.threshold.pips}}
- {{/if}} -
- - {{#paper-checkbox checked=flashingTransitions}}Flashing Transitions{{/paper-checkbox}} - +
+ + Hue Range + - - {{#paper-checkbox checked=colorloopMode}}Colorloop{{/paper-checkbox}} - + {{range-slider start=hueRange orientation="vertical" step=beatOptions.hueRange.step range=beatOptions.hueRange.range connect=hueRangeConnect on-slide="hueRangeChanged" pips=beatOptions.hueRange.pips}} +
-{{!-- - {{#paper-checkbox checked=ambienceMode}}Ambience{{/paper-checkbox}} ---}} -
-
+ {{#if usingMicAudio}} +
+ + Mic Boost + -
+ {{range-slider start=micBoost orientation="vertical" step=beatOptions.micBoost.step range=beatOptions.micBoost.range on-slide="micBoostChanged" pips=beatOptions.micBoost.pips}} +
+ {{/if}} -
-
-
-
-
-
-
-
-
-
+
+ + {{#paper-checkbox checked=flashingTransitions}}Flashing Transitions{{/paper-checkbox}} + -
-
+ + {{#paper-checkbox checked=colorloopMode}}Colorloop{{/paper-checkbox}} + + + {{!-- + {{#paper-checkbox checked=ambienceMode}}Ambience{{/paper-checkbox}} + --}} +
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+
-
-
{{ember-notify messageStyle='bootstrap' closeAfter=5000}} -{{add-soundcloud-sound-modal action="handleNewSoundCloudURL" isShowingModal=isShowingAddSoundCloudModal}} \ No newline at end of file +{{music-tab/add-soundcloud-sound-modal action="handleNewSoundCloudURL" isShowingModal=isShowingAddSoundCloudModal}} \ No newline at end of file diff --git a/web/app/styles/app.scss b/web/app/styles/app.scss index ad3ee0a..7509694 100644 --- a/web/app/styles/app.scss +++ b/web/app/styles/app.scss @@ -7,8 +7,8 @@ @import 'bridge-finder'; @import 'common'; @import 'dimmer'; +@import 'ember-notify'; @import 'fancy-speaker'; -@import 'index'; @import 'introjs'; @import 'group-controls'; @import 'hue-controls'; @@ -50,10 +50,6 @@ body, button { } } -.ember-notify-default.ember-notify-cn { - top: 20px; -} - .alert { margin-bottom: 0; border: none; diff --git a/web/app/styles/bootstrap.scss b/web/app/styles/bootstrap.scss index a514852..6d071e4 100644 --- a/web/app/styles/bootstrap.scss +++ b/web/app/styles/bootstrap.scss @@ -10,43 +10,43 @@ // Reset and dependencies @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/normalize"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/print"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/glyphicons"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/print"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/glyphicons"; // Core CSS @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/scaffolding"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/type"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/code"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/code"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/grid"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tables"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/forms"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/buttons"; // Components -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/dropdowns"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/input-groups"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navs"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navbar"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pagination"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pager"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/labels"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navs"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/navbar"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pagination"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/pager"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/labels"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/badges"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/jumbotron"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/thumbnails"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/alerts"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/media"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/list-group"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/panels"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/progress-bars"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/media"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/list-group"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/panels"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/wells"; -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/close"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/close"; // Components w/ JavaScript -@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals"; +//@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/modals"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; @import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/popovers"; //@import "bower_components/bootstrap-sass/assets/stylesheets/bootstrap/carousel"; diff --git a/web/app/styles/bridge-finder.scss b/web/app/styles/bridge-finder.scss index aedb623..2139190 100644 --- a/web/app/styles/bridge-finder.scss +++ b/web/app/styles/bridge-finder.scss @@ -14,3 +14,59 @@ max-width: 200px; margin: 0 auto; } + +#intro { + font-size: 22px; +} + +#intro-paragraph { + margin-bottom: 50px; + font-size: 16px; +} + +.bridge-finder, .ready-block { + text-align: center; + padding-top: 10px; + font-size: 16px; +} + +// preloading image +.ready-block:after { + display: none; + content: url(images/pressButtonBridge.png); +} + +.embed-container { + position:relative; + padding-bottom:56.25%; + padding-top:30px; + height:0; + overflow:hidden; +} + +.embed-container-wrapper { + max-width: 600px; + margin: auto; +} + +.embed-container iframe, .embed-container object, .embed-container embed { + position:absolute; + top:0; + left:0; + width:100%; + height:100%; +} + +.go-button { + margin-top: 20px; + border-radius: 100% !important; + width: 100px; + height: 100px; + span { + font-size: 28px; + width: 100%; + } + &:hover { + background: darken(#3f51b5, 10%) !important; + } +} \ No newline at end of file diff --git a/web/app/styles/ember-notify.scss b/web/app/styles/ember-notify.scss new file mode 100644 index 0000000..240a4a2 --- /dev/null +++ b/web/app/styles/ember-notify.scss @@ -0,0 +1,102 @@ +.ember-notify-default.ember-notify-cn { + position: fixed; + z-index: 5000; + right: 0; + top: 20px; +} + +.ember-notify-default .ember-notify { + display: block; + margin: 10px; + position: relative; + width: 300px; +} + +.ember-notify-default .ember-notify-show { + -webkit-animation-duration: 500ms; + animation-duration: 500ms; + -webkit-animation-name: ember-notify-show; + animation-name: ember-notify-show; + -webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.275); + animation-timing-function: cubic-bezier(0.175, 0.885, 0.320, 1.275); +} + +.ember-notify-default .ember-notify-hide { + -webkit-animation-duration: 250ms; + animation-duration: 250ms; + -webkit-animation-name: ember-notify-hide; + animation-name: ember-notify-hide; + -webkit-animation-timing-function: cubic-bezier(0.600, -0.280, 0.735, 0.045); + animation-timing-function: cubic-bezier(0.600, -0.280, 0.735, 0.045); +} + +.ember-notify-hide:hover { + -webkit-animation-play-state: paused; + -moz-animation-play-state: paused; + -o-animation-play-state: paused; + animation-play-state: paused; +} + +@-webkit-keyframes ember-notify-show { + from { + right: -310px; + } + to { + right: 0; + } +} + +@keyframes ember-notify-show { + from { + right: -310px; + } + to { + right: 0; + } +} +@-webkit-keyframes ember-notify-hide { + from { + right: 0; + } + to { + right: -310px; + } +} +@keyframes ember-notify-hide { + from { + right: 0; + } + to { + right: -310px; + } +} + +.ember-notify-default .ember-notify .close { + float: right; + cursor: pointer; +} + + +@media only screen and (max-width: 680px) { + .ember-notify-default.ember-notify-cn { + width: 100%; + padding-left: 20px; + box-sizing: border-box; + } + .ember-notify-default .ember-notify { + width: 100%; + float: right; + } +} + +.ember-notify-cn .clearfix { + *zoom: 1; +} +.ember-notify-cn .clearfix:before, +.ember-notify-cn .clearfix:after { + content: " "; + display: table; +} +.ember-notify-cn .clearfix:after { + clear: both; +} \ No newline at end of file diff --git a/web/app/styles/fancy-speaker.scss b/web/app/styles/fancy-speaker.scss index d2ddf97..8c4ccb3 100644 --- a/web/app/styles/fancy-speaker.scss +++ b/web/app/styles/fancy-speaker.scss @@ -57,6 +57,8 @@ $bezelsize: 240px; position: relative; background-color: #A8A8A8; box-shadow: 0 0 10px rgba(0, 0, 0, 0.8), inset 3px 3px 10px rgba(0, 0, 0, 0.8), 0 0 2px rgba(0, 0, 0, 0.8), inset 0 0 30px -5px rgba(0, 0, 0, 0.8); + top: 50%; + transform: translateY(-50%); } .rivet1 { @extend %rivet; diff --git a/web/app/styles/huegasm-variables.scss b/web/app/styles/huegasm-variables.scss index 3e7099c..6026e68 100644 --- a/web/app/styles/huegasm-variables.scss +++ b/web/app/styles/huegasm-variables.scss @@ -1,7 +1,7 @@ $playerHeight: 400px; $playerDefaultIconColor: #BBBBBB; $footerHeight: 40px; -$playerBottomHeight: 250px; +$playerBottomHeight: 255px; $secondaryThemeColor: #F12B24; $glowingText: 0 0 2px #fff, 0 0 8px #fff, 0 0 20px #228DFF; $dimmerOnButtonColor: #404040; \ No newline at end of file diff --git a/web/app/styles/index.scss b/web/app/styles/index.scss deleted file mode 100644 index 1637bbd..0000000 --- a/web/app/styles/index.scss +++ /dev/null @@ -1,53 +0,0 @@ -#intro { - font-size: 18px; -} - -#intro-paragraph { - margin-bottom: 50px; -} - -.bridgeFinder, .ready-block { - text-align: center; - padding-top: 10px; -} - -// preloading image -.ready-block:after { - display: none; - content: url(images/pressButtonBridge.png); -} - -.embed-container { - position:relative; - padding-bottom:56.25%; - padding-top:30px; - height:0; - overflow:hidden; -} - -.embed-container-wrapper { - max-width: 600px; - margin: auto; -} - -.embed-container iframe, .embed-container object, .embed-container embed { - position:absolute; - top:0; - left:0; - width:100%; - height:100%; -} - -.go-button { - margin-top: 20px; - border-radius: 100% !important; - width: 100px; - height: 100px; - span { - font-size: 28px; - width: 100%; - } - &:hover { - background: darken(#3f51b5, 10%) !important; - } -} \ No newline at end of file diff --git a/web/app/styles/music-tab.scss b/web/app/styles/music-tab.scss index 9ba2bc4..bedaaaf 100644 --- a/web/app/styles/music-tab.scss +++ b/web/app/styles/music-tab.scss @@ -10,9 +10,9 @@ #light-option { text-align: left !important; - top: 50%; - -webkit-transform: translateY(-50%); - transform: translateY(-50%); + top: 20%; + -webkit-transform: translateY(-20%); + transform: translateY(-20%); .tooltip { margin-top: 5px !important; left: 0 !important; @@ -107,7 +107,7 @@ } #player-area * .noUi-base { - background-color: $secondaryThemeColor; + background-color: black; border-radius: 5px; } @@ -185,17 +185,17 @@ font-weight: bold; } -#play-list-area.dragHereHighlight { +#play-list-area.drag-here-highlight { background-color: white; border: 5px dotted #5383ff; } -#play-list-area.draggingOver { +#play-list-area.dragging-over { background-color: darken(white, 5%); box-shadow: inset 0 0 20px 0 rgba(0, 0, 0, 1); } -#fileInput { +#file-input { width: 1px; height: 1px; visibility: hidden; @@ -280,14 +280,14 @@ } } -#playerBottom { +#player-bottom { color: black; border: 1px solid black; width: 100%; background: white; } -#beatContainer { +#beat-container { padding: 0; height: $playerBottomHeight; } diff --git a/web/app/styles/noui-slider.scss b/web/app/styles/noui-slider.scss index 0557201..6c2e569 100644 --- a/web/app/styles/noui-slider.scss +++ b/web/app/styles/noui-slider.scss @@ -2,11 +2,11 @@ .noUi-value-vertical { margin-top: -10px; + transform: none; } .noUi-value-vertical, .noUi-pips { color: inherit !important; - font: 400 14px 'Slabo 27px'; } .noUi-vertical .noUi-handle {