From 308acd58e84ea05fef46bf9efa5b06dd1c2fe6a6 Mon Sep 17 00:00:00 2001 From: lone-cloud Date: Tue, 8 Sep 2015 09:27:32 -0700 Subject: [PATCH] Resolving slow compilation times --- app/components/controls/music-control.js | 2 +- app/styles/app.scss | 4 ++-- bower.json | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/components/controls/music-control.js b/app/components/controls/music-control.js index ec4ec21..a19046a 100644 --- a/app/components/controls/music-control.js +++ b/app/components/controls/music-control.js @@ -20,7 +20,7 @@ export default Em.Component.extend({ } }, decay: { - range: {min: 0.01, max: 0.1}, + range: {min: 0, max: 0.1}, step: 0.01, defaultValue: 0.02, pips: { diff --git a/app/styles/app.scss b/app/styles/app.scss index cd56935..12160da 100644 --- a/app/styles/app.scss +++ b/app/styles/app.scss @@ -383,7 +383,7 @@ md-toolbar { } #beatArea * .noUi-vertical { - height: 150px; + height: 170px; margin-top: 20px; } @@ -431,7 +431,7 @@ md-toolbar { } #beatArea .lightGroup { - margin: 10px 0 20px 40px; + margin: 10px 0 0 40px; } #playerButtonGroup { diff --git a/bower.json b/bower.json index 52170a5..cb004ff 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "huegasm", "dependencies": { "bootstrap-sass": "~3.3.5", - "ember": "1.13.6", + "ember": "~2.0.2", "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3", "ember-cli-test-loader": "ember-cli-test-loader#0.1.3", "ember-data": "~1.13.9", @@ -12,9 +12,8 @@ "ember-resolver": "~0.1.18", "hammerjs": "~2.0.4", "JavaScript-ID3-Reader": "https://github.com/aadsm/JavaScript-ID3-Reader.git", - "jquery": "^1.11.1", + "jquery": "~2.1.4", "loader.js": "ember-cli/loader.js#3.2.0", - "material-design-icons": "~2.0.0", "nouislider": "^8.0.1", "qunit": "~1.18.0" }