diff --git a/app/pods/components/music-tab/component.js b/app/pods/components/music-tab/component.js index c61cd61..a66edd2 100644 --- a/app/pods/components/music-tab/component.js +++ b/app/pods/components/music-tab/component.js @@ -864,7 +864,6 @@ export default Em.Component.extend(helperMixin, visualizerMixin, { this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/vallis-alps-young-feki-remix'); this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/andrew-luce-when-to-love-you-feat-chelsea-cutler'); this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/ahh-ooh-carefree-with-me'); - this.send('handleNewSoundCloudURL', 'https://soundcloud.com/odesza/light-feat-little-dragon'); this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/crywolf-slow-burn'); this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/clozee-red-forest'); this.send('handleNewSoundCloudURL', 'https://soundcloud.com/mrsuicidesheep/elo-method-subranger-solace'); diff --git a/app/pods/components/music-tab/template.hbs b/app/pods/components/music-tab/template.hbs index aec2b29..5781331 100644 --- a/app/pods/components/music-tab/template.hbs +++ b/app/pods/components/music-tab/template.hbs @@ -202,6 +202,6 @@ -{{ember-notify closeAfter=100000 classPrefix="customNotify"}} +{{ember-notify messageStyle='bootstrap' closeAfter=5000}} {{add-soundcloud-sound-modal action="handleNewSoundCloudURL" isShowingModal=isShowingAddSoundCloudModal}} \ No newline at end of file diff --git a/app/styles/app.scss b/app/styles/app.scss index a0a6a26..f8a8758 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -98,24 +98,13 @@ md-checkbox .md-label { } } +.ember-notify-default.ember-notify-cn { + top: 20px; +} + .alert { 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%); - } + border: none; } .relative { @@ -777,17 +766,6 @@ md-switch.md-default-theme.md-checked .md-thumb { } } -.customNotify { - top: 0; - position: absolute; - right: 20px; - max-width: 400px; - .alert-box { - position: relative; - overflow: hidden; - } -} - .songArtist { font-weight: bold; } diff --git a/bower.json b/bower.json index aa1f43b..bff4dd1 100644 --- a/bower.json +++ b/bower.json @@ -7,13 +7,13 @@ "ember-cli-test-loader": "0.2.2", "ember-load-initializers": "0.5.1", "ember-qunit-notifications": "0.1.0", - "hammerjs": "~2.0.4", - "intro.js": "~1.1.1", + "intro.js": "~2.1.0", "JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git", "jquery-mousewheel": "~3.1.13", "locallyjs": "~0.3.2", - "matchMedia": "~0.2.0", + "matchMedia": "~0.3.0", "nouislider": "^8.3.0", - "HackTimer": "https://github.com/turuslan/HackTimer.git#~1.0.0" + "HackTimer": "https://github.com/turuslan/HackTimer.git#~1.0.0", + "hammer.js": "^2.0.8" } } diff --git a/package.json b/package.json index 0bcfed4..3233106 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "build": "ember build", "test": "ember test" }, - "repository": "", "engines": { "node": ">= 0.10.0" }, @@ -38,10 +37,10 @@ "ember-export-application-global": "^1.0.4", "ember-load-initializers": "^0.5.0", "ember-modal-dialog": "0.8.3", - "ember-notify": "^5.0.2", - "ember-paper": "^0.2.12", + "ember-notify": "^5.0.4", + "ember-paper": "^0.2.14", "ember-resolver": "^2.0.3", "ember-truth-helpers": "1.2.0", - "loader.js": "^4.0.0" + "loader.js": "^4.0.7" } }