From fa9005c6f98a05fd22ea91d2449e1fc457d49c56 Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Tue, 3 Nov 2015 23:42:33 -0800 Subject: [PATCH] hiding notification --- app/pods/components/music-tab/component.js | 13 ++++++------ app/styles/app.scss | 23 +++++++++++++++++++++- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index c227f5e..f77b2f5 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -588,7 +588,7 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { this.set('dragLeaveTimeoutHandle', setTimeout(function(){ self.set('dragging', false); }, 500)); }, - simulateKick(mag, ratioKickMag) { + simulateKick(/*mag, ratioKickMag*/) { var activeLights = this.get('activeLights'), lightsData = this.get('lightsData'), color = null, @@ -640,10 +640,6 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { color = Math.floor(Math.random() * 65535); } - if(ratioKickMag) { - brightnessOnBeat /= 2; - } - if(transitiontime){ timeToBriOff = 80; } @@ -713,10 +709,15 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { var self = this; + // file input code Em.$('#fileInput').on('change', function () { var files = this.files; self.send('handleNewFiles', files); - this.value = null; + this.value = null; // reset in case upload the second file again + }); + + Em.$(document).on('click', '.alert', (event)=>{ + Em.$(event.target).addClass('removed'); }); // prevent space/text selection when the user repeatedly clicks on the center diff --git a/app/styles/app.scss b/app/styles/app.scss index 66a0830..7200e58 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -77,6 +77,22 @@ md-checkbox.md-default-theme.md-checked .md-icon { margin-bottom: 0; } +.removed { + animation: disapear 1s; + animation-fill-mode: forwards; +} + +@keyframes disapear{ + 50% { + -webkit-transform: translateX(-5%); + transform: translateX(-5%); + } + 100% { + -webkit-transform: translateX(200%); + transform: translateX(200%); + } +} + .relative { position: relative; } @@ -370,6 +386,7 @@ md-slider.md-default-theme .md-thumb:after { box-shadow: 0 0 1px rgba(0, 0, 0, 0); } img:hover { + -webkit-transform: scale(1.2); transform: scale(1.2); } } @@ -493,6 +510,10 @@ md-toolbar { top: 50%; -webkit-transform: translateY(-50%); transform: translateY(-50%); + .tooltip { + margin-top: 5px !important; + margin-left: -30px !important; + } } #musicTab{ @@ -582,10 +603,10 @@ md-switch.md-default-theme.md-checked .md-thumb { opacity: 0.8; font-size: 24px; } - to { opacity: 0; transform: scale(3); + -webkit-transform: scale(3); } }