- {{#each tabData as |tab|}}
-
{{tab.name}}
- {{/each}}
- {{#paper-menu as |menu|}}
- {{#menu.trigger}}
- {{#paper-button iconButton=true}}
- {{paper-icon "settings-icon" class=dimmerOnClass size=28}}
- {{/paper-button}}
- {{/menu.trigger}}
- {{#menu.content width=3 as |content|}}
- {{#content.menu-item onClick="toggleDimmer"}}
- {{paper-icon "lightbulb outline" class=dimmerOnClass}} Dark Mode: {{if dimmerOn "On" "Off"}}
- {{/content.menu-item}}
+
+
+ {{#each tabData as |tab|}}
+ {{tab.name}}
+ {{/each}}
+ {{#paper-menu as |menu|}}
+ {{#menu.trigger}}
+ {{#paper-button iconButton=true}}
+ {{paper-icon "settings-icon" class=dimmerOnClass size=28}}
+ {{/paper-button}}
+ {{/menu.trigger}}
+ {{#menu.content width=3 as |content|}}
+ {{#content.menu-item onClick="toggleDimmer"}}
+ {{paper-icon "lightbulb outline" class=dimmerOnClass}} Dark Mode: {{if dimmerOn "On" "Off"}}
+ {{/content.menu-item}}
- {{#content.menu-item onClick="clearBridge"}}
- {{paper-icon "compare arrows" class=dimmerOnClass}} Switch bridge
- {{/content.menu-item}}
+ {{#content.menu-item onClick="clearBridge"}}
+ {{paper-icon "compare arrows" class=dimmerOnClass}} Switch bridge
+ {{/content.menu-item}}
- {{#content.menu-item onClick="startIntro"}}
- {{paper-icon "cached" class=dimmerOnClass}} Restart tutorial
- {{/content.menu-item}}
+ {{#content.menu-item onClick="startIntro"}}
+ {{paper-icon "cached" class=dimmerOnClass}} Restart tutorial
+ {{/content.menu-item}}
- {{#content.menu-item onClick="clearAllSettings"}}
- {{paper-icon "settings backup restore" class=dimmerOnClass}} Reset settings
- {{/content.menu-item}}
- {{/menu.content}}
- {{/paper-menu}}
+ {{#content.menu-item onClick="clearAllSettings"}}
+ {{paper-icon "settings backup restore" class=dimmerOnClass}} Reset settings
+ {{/content.menu-item}}
+ {{/menu.content}}
+ {{/paper-menu}}
+
{{light-group lightsData=lightsData activeLights=activeLights syncLight=syncLight apiURL=apiURL dimmerOn=dimmerOn storage=storage}}
diff --git a/web/app/pods/components/lights-tab/component.js b/web/app/pods/components/lights-tab/component.js
index 0a8de4c..a6873ce 100644
--- a/web/app/pods/components/lights-tab/component.js
+++ b/web/app/pods/components/lights-tab/component.js
@@ -9,7 +9,7 @@ const {
} = Ember;
export default Component.extend({
- classNames: ['col-sm-8', 'col-sm-offset-2', 'col-xs-12'],
+ classNames: ['col-sm-10', 'col-sm-offset-1', 'col-xs-12'],
classNameBindings: ['active::hidden'],
elementId: 'lights-tab',
diff --git a/web/app/pods/components/music-tab/mixins/helpers.js b/web/app/pods/components/music-tab/mixins/helpers.js
index 9e55a21..3d6d033 100644
--- a/web/app/pods/components/music-tab/mixins/helpers.js
+++ b/web/app/pods/components/music-tab/mixins/helpers.js
@@ -12,7 +12,7 @@ const {
} = Ember;
export default Mixin.create({
- classNames: ['col-sm-8', 'col-sm-offset-2', 'col-xs-12'],
+ classNames: ['col-sm-10', 'col-sm-offset-1', 'col-xs-12'],
classNameBindings: ['active::hidden'],
elementId: 'music-tab',
diff --git a/web/app/styles/hue-controls.scss b/web/app/styles/hue-controls.scss
index b7812ac..8520d54 100644
--- a/web/app/styles/hue-controls.scss
+++ b/web/app/styles/hue-controls.scss
@@ -38,7 +38,6 @@
}
#navigation {
- max-width: 800px;
padding: 15px 0;
text-align: center;
margin: auto;
diff --git a/web/app/styles/introjs.scss b/web/app/styles/introjs.scss
index 5a43f76..ecc3f4d 100644
--- a/web/app/styles/introjs.scss
+++ b/web/app/styles/introjs.scss
@@ -8,6 +8,7 @@
.introjs-tooltip {
color: $blackish;
+ width: 300px;
}
.introjs-skipbutton {
diff --git a/web/app/styles/music-tab.scss b/web/app/styles/music-tab.scss
index d731534..20cc5d3 100644
--- a/web/app/styles/music-tab.scss
+++ b/web/app/styles/music-tab.scss
@@ -309,7 +309,6 @@
border: 1px solid black;
width: 100%;
background: white;
- padding-bottom: 20px;
border-bottom-left-radius: 5px;
border-bottom-right-radius: 5px
}
@@ -421,11 +420,16 @@
#soundcloud-logo {
display: block;
}
+
#soundcloud-logo-small {
display: none;
}
-@media(max-width:900px) {
+#soundcloud-tutorial {
+ width: 100%;
+}
+
+@media(max-width:1100px) {
#soundcloud-logo {
display: none;
}
@@ -434,7 +438,7 @@
}
}
-@media(min-width:767px) and (max-width:1000px) {
+@media(min-width:767px) and (max-width:1200px) {
#add-new-music-label {
display: none;
}
diff --git a/web/package.json b/web/package.json
index a9b4fce..dc778a4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -27,7 +27,7 @@
"ember-cli-htmlbars": "^1.0.1",
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
"ember-cli-inject-live-reload": "^1.3.1",
- "ember-cli-nouislider": "^0.10.0",
+ "ember-cli-nouislider": "^0.11.0",
"ember-cli-qunit": "^1.2.1",
"ember-cli-release": "0.2.8",
"ember-cli-sass": "^5.2.1",
@@ -35,7 +35,7 @@
"ember-cli-test-loader": "^1.1.0",
"ember-cli-uglify": "^1.2.0",
"ember-export-application-global": "^1.0.4",
- "ember-load-initializers": "^0.5.0",
+ "ember-load-initializers": "^0.6.3",
"ember-modal-dialog": "^0.9.0",
"ember-notify": "^5.0.4",
"ember-paper": "^1.0.0-alpha.11",
diff --git a/web/public/assets/images/soundcloudUrl.png b/web/public/assets/images/soundcloudUrl.png
new file mode 100644
index 0000000..a2f173d
Binary files /dev/null and b/web/public/assets/images/soundcloudUrl.png differ
diff --git a/web/yarn.lock b/web/yarn.lock
index d1c241f..37dac61 100644
--- a/web/yarn.lock
+++ b/web/yarn.lock
@@ -177,6 +177,10 @@ ast-types@0.8.12:
version "0.8.12"
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
+ast-types@0.8.15:
+ version "0.8.15"
+ resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
+
ast-types@0.9.2:
version "0.9.2"
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.2.tgz#2cc19979d15c655108bf565323b8e7ee38751f6b"
@@ -867,12 +871,12 @@ can-symlink@^1.0.0:
tmp "0.0.28"
caniuse-db@^1.0.30000153, caniuse-db@^1.0.30000214:
- version "1.0.30000597"
- resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000597.tgz#b52e6cbe9dc83669affb98501629feaee1af6588"
+ version "1.0.30000600"
+ resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000600.tgz#2d0892f77eebb399c3c17b3ecb72da7b8740f31f"
capture-exit@^1.0.4:
- version "1.0.7"
- resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.0.7.tgz#69b4023241347a9b3db9f13eb91d22765e9a86f8"
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.1.0.tgz#d931b32b11c2bd20ae57f34af0c1eb2c18781626"
dependencies:
rsvp "^3.3.3"
@@ -952,8 +956,8 @@ clean-css-promise@^0.1.0:
pinkie-promise "^2.0.0"
clean-css@^3.4.5:
- version "3.4.22"
- resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.22.tgz#db323064f752028778233b58c54cd8535f860892"
+ version "3.4.23"
+ resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-3.4.23.tgz#604fbbca24c12feb59b02f00b84f1fb7ded6d001"
dependencies:
commander "2.8.x"
source-map "0.4.x"
@@ -1268,8 +1272,8 @@ debug@2.2.0, debug@~2.2.0:
ms "0.7.1"
debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/debug/-/debug-2.3.3.tgz#40c453e67e6e13c901ddec317af8986cda9eff8c"
+ version "2.4.5"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-2.4.5.tgz#34c7b12a1ca96674428f41fe92c49b4ce7cd0607"
dependencies:
ms "0.7.2"
@@ -1442,7 +1446,7 @@ ember-cli-babel@5.1.10:
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"
-ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6:
+ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7:
version "5.2.1"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.1.tgz#14a1a7b3ae9e9f1284f7bcdb142eb53bd0b1b5bd"
dependencies:
@@ -1487,7 +1491,7 @@ ember-cli-htmlbars-inline-precompile@^0.3.1:
ember-cli-htmlbars "^1.0.0"
hash-for-dep "^1.0.2"
-ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
+ember-cli-htmlbars@^1.0.0, ember-cli-htmlbars@^1.0.1, ember-cli-htmlbars@^1.0.10, ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.1.1.tgz#8776cf59796dac8f32e8625fc6d1ea45ffa55de1"
dependencies:
@@ -1537,12 +1541,12 @@ ember-cli-normalize-entity-name@^1.0.0:
dependencies:
silent-error "^1.0.0"
-ember-cli-nouislider@^0.10.0:
- version "0.10.0"
- resolved "https://registry.yarnpkg.com/ember-cli-nouislider/-/ember-cli-nouislider-0.10.0.tgz#94bda98cc3d8809cbceb41cdf151b715528e5570"
+ember-cli-nouislider@^0.11.0:
+ version "0.11.0"
+ resolved "https://registry.yarnpkg.com/ember-cli-nouislider/-/ember-cli-nouislider-0.11.0.tgz#645cf05be1e977376f2567b5b6ac845fe7c71314"
dependencies:
- ember-cli-babel "^5.1.6"
- ember-cli-htmlbars "^1.0.3"
+ ember-cli-babel "^5.1.7"
+ ember-cli-htmlbars "^1.0.10"
ember-cli-path-utils@^1.0.0:
version "1.0.0"
@@ -1632,7 +1636,7 @@ ember-cli-valid-component-name@^1.0.0:
dependencies:
silent-error "^1.0.0"
-ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7:
+ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.2.0.tgz#caa286b77d1b485df5d2f62c67a6f19aa8b582c4"
dependencies:
@@ -1732,16 +1736,16 @@ ember-composability-tools@0.0.5:
ember-wormhole "0.4.1"
ember-concurrency@^0.7.9:
- version "0.7.15"
- resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.15.tgz#a35577e20220e9ddc93b0b801dbb9fd7554aca49"
+ version "0.7.17"
+ resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.7.17.tgz#28f963c96fa5d1c42bb4b239c0212220d849738f"
dependencies:
ember-cli-babel "^5.1.5"
- ember-getowner-polyfill "1.0.1"
+ ember-getowner-polyfill "^1.1.0"
ember-maybe-import-regenerator "^0.1.4"
-ember-css-transitions@0.1.7:
- version "0.1.7"
- resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.7.tgz#ceac6c5d09744fac7e6aee5b6a9e1d107bc50a7e"
+ember-css-transitions@0.1.8:
+ version "0.1.8"
+ resolved "https://registry.yarnpkg.com/ember-css-transitions/-/ember-css-transitions-0.1.8.tgz#2c9454b4cc1db367849a4f8a7e8c4b082bb97d19"
dependencies:
ember-cli-babel "^5.1.6"
@@ -1751,15 +1755,18 @@ ember-export-application-global@^1.0.4:
dependencies:
ember-cli-babel "^5.1.10"
-ember-getowner-polyfill@1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.0.1.tgz#f60a31d25d642461dac4b4746184afaf7f5084ae"
+ember-getowner-polyfill@^1.1.0:
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.1.1.tgz#6bb6603827dd2f8f33be2434570a86cc9e5273ff"
dependencies:
- ember-cli-babel "^5.1.5"
+ ember-cli-babel "^5.1.6"
+ ember-cli-version-checker "^1.2.0"
-ember-load-initializers@^0.5.0:
- version "0.5.1"
- resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.5.1.tgz#76e3db23c111dbdcd3ae6f687036bf0b56be0cbe"
+ember-load-initializers@^0.6.3:
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-0.6.3.tgz#f47396ad271ba77294068c98f992a5f19705441a"
+ dependencies:
+ ember-cli-babel "^5.1.6"
ember-maybe-import-regenerator@^0.1.4:
version "0.1.4"
@@ -1789,8 +1796,8 @@ ember-notify@^5.0.4:
object-assign "^4.1.0"
ember-paper@^1.0.0-alpha.11:
- version "1.0.0-alpha.11"
- resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.11.tgz#200a729a8bb9e1cc0fe2788785e5b404d18fd291"
+ version "1.0.0-alpha.12"
+ resolved "https://registry.yarnpkg.com/ember-paper/-/ember-paper-1.0.0-alpha.12.tgz#9d686e5a05afd89f3143c0e72153d9c7f02b5b2a"
dependencies:
angular-material-source angular/material#v1.0.6
broccoli-autoprefixer "^3.0.0"
@@ -1798,9 +1805,9 @@ ember-paper@^1.0.0-alpha.11:
broccoli-funnel "^1.0.1"
broccoli-merge-trees "^1.1.0"
ember-basic-dropdown "^0.16.0"
- ember-cli-babel "^5.1.6"
+ ember-cli-babel "^5.1.7"
ember-composability-tools "0.0.5"
- ember-css-transitions "0.1.7"
+ ember-css-transitions "0.1.8"
ember-power-select "1.0.0-beta.23"
ember-wormhole "0.4.1"
resolve "^1.1.7"
@@ -2165,7 +2172,7 @@ faye-websocket@~0.10.0:
fb-watchman@^1.8.0:
version "1.9.0"
- resolved "http://registry.npmjs.org/fb-watchman/-/fb-watchman-1.9.0.tgz#6f268f1f347a6b3c875d1e89da7e1ed79adfc0ec"
+ resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-1.9.0.tgz#6f268f1f347a6b3c875d1e89da7e1ed79adfc0ec"
dependencies:
bser "^1.0.2"
@@ -2312,8 +2319,8 @@ fs-readdir-recursive@^0.1.0:
resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4:
- version "0.5.5"
- resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.5.tgz#7825b4db454225dd114e7abd58e8926fe068cbff"
+ version "0.5.6"
+ resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-0.5.6.tgz#342665749e8dca406800b672268c8f5073f3e623"
dependencies:
heimdalljs-logger "^0.1.7"
object-assign "^4.1.0"
@@ -2423,11 +2430,7 @@ getpass@^0.1.1:
dependencies:
assert-plus "^1.0.0"
-git-repo-info@^1.0.4:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.3.1.tgz#0c1a19ef1964b822a7230f087396af80481ce8ec"
-
-git-repo-info@~1.2.0:
+git-repo-info@^1.0.4, git-repo-info@~1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2"
@@ -2594,10 +2597,11 @@ has-unicode@^2.0.0, has-unicode@~2.0.1:
resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
hash-for-dep@^1.0.2:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.3.tgz#b57f18a0ace56380951638a3b36a6b73d8619b8b"
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.0.4.tgz#8774e7b80c7c07be3bdc58b55278a4c6865d3737"
dependencies:
broccoli-kitchen-sink-helpers "^0.3.1"
+ heimdalljs "^0.2.3"
resolve "^1.1.6"
hawk@~3.1.3:
@@ -2622,7 +2626,7 @@ heimdalljs-logger@^0.1.7:
debug "^2.2.0"
heimdalljs "^0.2.0"
-heimdalljs@^0.2.0, heimdalljs@^0.2.1:
+heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.3.tgz#35b82a6a4d73541fc4fb88d2fe2b23608fb4f779"
dependencies:
@@ -3530,7 +3534,7 @@ minimatch@^2.0.3:
dependencies:
brace-expansion "^1.0.0"
-minimist@0.0.8:
+minimist@0.0.8, minimist@~0.0.1:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -3538,10 +3542,6 @@ minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-minimist@~0.0.1:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
@@ -4117,11 +4117,11 @@ q@^1.1.2:
version "1.4.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-qs@6.2.0, qs@^6.2.0, qs@~6.2.0:
+qs@6.2.0, qs@~6.2.0:
version "6.2.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.0.tgz#3b7848c03c2dece69a9522b0fae8c4126d745f3b"
-qs@~6.3.0:
+qs@^6.2.0, qs@~6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
@@ -4284,7 +4284,7 @@ realize-package-specifier@~3.0.3:
dezalgo "^1.0.1"
npm-package-arg "^4.1.1"
-recast@0.10.33, recast@^0.10.10:
+recast@0.10.33:
version "0.10.33"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
dependencies:
@@ -4293,6 +4293,15 @@ recast@0.10.33, recast@^0.10.10:
private "~0.1.5"
source-map "~0.5.0"
+recast@^0.10.10:
+ version "0.10.43"
+ resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
+ dependencies:
+ ast-types "0.8.15"
+ esprima-fb "~15001.1001.0-dev-harmony-fb"
+ private "~0.1.5"
+ source-map "~0.5.0"
+
recast@^0.11.17, recast@^0.11.3:
version "0.11.18"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.18.tgz#07af6257ca769868815209401d4d60eef1b5b947"