diff --git a/chrome/app/pods/components/bridge-finder/template.hbs b/chrome/app/pods/components/bridge-finder/template.hbs index cb665cd..e59f28e 100644 --- a/chrome/app/pods/components/bridge-finder/template.hbs +++ b/chrome/app/pods/components/bridge-finder/template.hbs @@ -1,4 +1,3 @@ -
Huegasm
{{#unless bridgeUsername}} {{#if bridgeIp}} {{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}} diff --git a/chrome/app/styles/app.scss b/chrome/app/styles/app.scss index 8a0b53b..0e88234 100644 --- a/chrome/app/styles/app.scss +++ b/chrome/app/styles/app.scss @@ -41,14 +41,6 @@ body, button { border: none; } - -.title { - margin-bottom: 20px; - img { - width: 200px; - } -} - button.md-warn { background: $secondaryThemeColor; } diff --git a/chrome/app/styles/bridge-finder.scss b/chrome/app/styles/bridge-finder.scss index 79b355e..4d4c81c 100644 --- a/chrome/app/styles/bridge-finder.scss +++ b/chrome/app/styles/bridge-finder.scss @@ -15,15 +15,6 @@ margin: 30px auto 20px; } -#intro { - font-size: 22px; -} - -#intro-paragraph { - margin-bottom: 20px; - font-size: 16px; -} - #bridge-finder, .ready-block { text-align: center; padding: 10px 15px 0; @@ -31,42 +22,10 @@ } #bridge-finder { + flex-direction: column; + display: flex; + justify-content: center; .md-bar { background-color: $secondaryThemeColor !important; } -} - -// 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: 550px; - margin: auto; -} - -.embed-container iframe, .embed-container object, .embed-container embed { - position:absolute; - top:0; - left:0; - width:100%; - height:100%; -} - -.go-button { - margin: 20px 0; - border-radius: 100% !important; - width: 100px; - height: 100px; - font-size: 28px; -} +} \ No newline at end of file diff --git a/chrome/public/assets/images/logo.png b/chrome/public/assets/images/logo.png deleted file mode 100644 index e384e77..0000000 Binary files a/chrome/public/assets/images/logo.png and /dev/null differ diff --git a/mobile/app/pods/components/bridge-finder/template.hbs b/mobile/app/pods/components/bridge-finder/template.hbs index a0af360..08cf26e 100644 --- a/mobile/app/pods/components/bridge-finder/template.hbs +++ b/mobile/app/pods/components/bridge-finder/template.hbs @@ -1,4 +1,3 @@ -
Huegasm
{{#unless bridgeUsername}} {{#if bridgeIp}} {{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}} diff --git a/mobile/app/pods/components/music-tab/mixins/helpers.js b/mobile/app/pods/components/music-tab/mixins/helpers.js index 88e90d5..95214f4 100644 --- a/mobile/app/pods/components/music-tab/mixins/helpers.js +++ b/mobile/app/pods/components/music-tab/mixins/helpers.js @@ -75,17 +75,21 @@ export default Mixin.create({ defaultValue: 0, pips: { mode: 'values', - values: [1, 50, 100, 150, 200, 254], + values: [1, 63, 127, 190, 254], density: 10, format: { to: function (value) { - if (value === 50) { - value = 20; - } else if (value === 100) { - value = 40; - } else { - value = 'Low'; + if (value === 63) { + value = 25; + } else if (value === 127) { + value = 50; + } else if (value === 190) { + value = 75; + } else if (value === 254) { + value = 100; } + + return value; }, from: function (value) { return value; } } diff --git a/mobile/app/styles/app.scss b/mobile/app/styles/app.scss index 312be8a..ce5e475 100644 --- a/mobile/app/styles/app.scss +++ b/mobile/app/styles/app.scss @@ -52,13 +52,6 @@ div.ember-modal-dialog { } } -.title { - margin-bottom: 50px; - img { - width: 200px; - } -} - .ps-scrollbar-y-rail { opacity: 1 !important; } diff --git a/mobile/app/styles/bridge-finder.scss b/mobile/app/styles/bridge-finder.scss index b71547b..73f507a 100644 --- a/mobile/app/styles/bridge-finder.scss +++ b/mobile/app/styles/bridge-finder.scss @@ -19,6 +19,10 @@ text-align: center; padding: 20px 15px 0; font-size: 16px; + flex-direction: column; + display: flex; + justify-content: center; + height: 100vh; } #bridge-finder .md-bar { diff --git a/mobile/public/assets/images/logo.png b/mobile/public/assets/images/logo.png deleted file mode 100644 index e384e77..0000000 Binary files a/mobile/public/assets/images/logo.png and /dev/null differ diff --git a/web/app/pods/application/template.hbs b/web/app/pods/application/template.hbs index 38cb29e..6347e1f 100644 --- a/web/app/pods/application/template.hbs +++ b/web/app/pods/application/template.hbs @@ -1,3 +1,2 @@ -{{huegasm-app toggleLightsIcons="toggleLightsIcons" toggleDimmer="toggleDimmer" dimmerOn=dimmerOn lightsIconsOn=lightsIconsOn storage=storage}} - -{{huegasm-footer action="toggleDimmer" dimmerOn=dimmerOn storage=storage}} \ No newline at end of file +{{huegasm-app toggleLightsIcons="toggleLightsIcons" toggleDimmer="toggleDimmer" dimmerOn=dimmerOn lightsIconsOn=lightsIconsOn +storage=storage}} {{huegasm-footer storage=storage}} \ No newline at end of file diff --git a/web/app/pods/components/bridge-finder/template.hbs b/web/app/pods/components/bridge-finder/template.hbs index cb665cd..e59f28e 100644 --- a/web/app/pods/components/bridge-finder/template.hbs +++ b/web/app/pods/components/bridge-finder/template.hbs @@ -1,4 +1,3 @@ -
Huegasm
{{#unless bridgeUsername}} {{#if bridgeIp}} {{paper-progress-linear warn=true value=bridgeUserNamePingIntervalProgress}} diff --git a/web/app/pods/components/huegasm-app/template.hbs b/web/app/pods/components/huegasm-app/template.hbs index 08a1c56..4895e54 100644 --- a/web/app/pods/components/huegasm-app/template.hbs +++ b/web/app/pods/components/huegasm-app/template.hbs @@ -6,23 +6,25 @@ {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial storage=storage}} {{else}}
-
- Huegasm -
- -

- Your lights meet your music. -

-

- Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music. -

- -
-
- +
+
+

+ Your lights meet your music. +

+

+ Huegasm is a free web application for managing and synchronizing your Philips Hue lights with the beat of your music. +

- {{paper-button raised=true primary=true warn=true onClick=(action "isReady") class="go-button center-block" label="START"}} + +

Click START to get started with Huegasm.

+ +
+ {{paper-button raised=true primary=true warn=true onClick=(action "isReady") class="go-button center-block" label="START"}} + + {{paper-icon "ondemand video" size=28}} + +
{{/if}} {{/if}} \ No newline at end of file diff --git a/web/app/pods/components/huegasm-footer/component.js b/web/app/pods/components/huegasm-footer/component.js index a88ccd2..ff81757 100644 --- a/web/app/pods/components/huegasm-footer/component.js +++ b/web/app/pods/components/huegasm-footer/component.js @@ -11,11 +11,5 @@ export default Component.extend({ year: computed(function () { return new Date().getFullYear(); - }), - - actions: { - toggleDimmer() { - this.sendAction(); - } - } + }) }); diff --git a/web/app/pods/components/huegasm-footer/template.hbs b/web/app/pods/components/huegasm-footer/template.hbs index 9ad0fb3..4bf5a43 100644 --- a/web/app/pods/components/huegasm-footer/template.hbs +++ b/web/app/pods/components/huegasm-footer/template.hbs @@ -1,5 +1,3 @@ - -
© {{year}} diff --git a/web/app/styles/app.scss b/web/app/styles/app.scss index 3b2c08b..e941bd1 100644 --- a/web/app/styles/app.scss +++ b/web/app/styles/app.scss @@ -42,6 +42,7 @@ body, button { display: flex; align-items: center; justify-content: space-between; + padding: 0 15px; } @media(min-width:767px) { @@ -53,6 +54,7 @@ body, button { .footer-text { display: inline-block; font-size: 18px; + padding-left: 39%; a { margin-left: 5px; } @@ -63,14 +65,6 @@ body, button { border: none; } - -.title { - margin-bottom: 20px; - img { - width: 200px; - } -} - button.md-warn { background: $secondaryThemeColor; } @@ -93,8 +87,40 @@ div.ember-modal-dialog { display: flex !important; } +#intro-background { + min-height: 50vh; + min-height: 200px; + display: flex; + margin-bottom: 20px; + padding: 10px 0; + #intro-wrapper { + width: 80%; + padding: 10px; + border-radius: 5px; + margin: auto; + } +} + +.video-icon { + position: absolute; +} + +@media(max-width:768px) { + .footer-text { + padding-left: 0 !important; + } +} + // fancy webkit scrollbars @media(min-width:767px) { + #intro { + padding: 3vh 0; + } + + #intro-paragraph { + padding-bottom: 2vh; + } + ::-webkit-scrollbar { -webkit-appearance: none; } diff --git a/web/app/styles/bridge-finder.scss b/web/app/styles/bridge-finder.scss index f6ef407..26a891f 100644 --- a/web/app/styles/bridge-finder.scss +++ b/web/app/styles/bridge-finder.scss @@ -16,22 +16,24 @@ } #intro { - font-size: 22px; + font-size: 32px; } #intro-paragraph { margin-bottom: 20px; - font-size: 16px; + font-size: 20px; } #bridge-finder, .ready-block { text-align: center; - padding: 10px 15px 0; font-size: 16px; } #bridge-finder { min-height: 500px; + flex-direction: column; + display: flex; + justify-content: center; .md-bar { background-color: $secondaryThemeColor !important; } @@ -51,11 +53,6 @@ overflow:hidden; } -.embed-container-wrapper { - max-width: 550px; - margin: auto; -} - .embed-container iframe, .embed-container object, .embed-container embed { position:absolute; top:0;