From 0be7d3d585fc97403036e2bfd56fd06a5650a0a4 Mon Sep 17 00:00:00 2001
From: Egor Philippov <ephilippov@absolute.com>
Date: Thu, 10 Sep 2015 11:06:28 -0700
Subject: [PATCH] Footer nightmare = solved

---
 app/components/bridge-controls.js            |  2 +-
 app/components/bridge-finder.js              |  3 +--
 app/components/huegasm-app.js                |  2 +-
 app/styles/app.scss                          | 23 ++++++++++----------
 app/templates/components/bridge-controls.hbs |  4 +---
 app/templates/components/huegasm-app.hbs     |  4 +---
 6 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/app/components/bridge-controls.js b/app/components/bridge-controls.js
index becf448..0164335 100644
--- a/app/components/bridge-controls.js
+++ b/app/components/bridge-controls.js
@@ -1,7 +1,7 @@
 import Em from 'ember';
 
 export default Em.Component.extend({
-  classNames: ['bridgeControls', 'maxHeight'],
+  classNames: ['bridgeControls'],
 
   bridgeIp: null,
   manualBridgeIp: null,
diff --git a/app/components/bridge-finder.js b/app/components/bridge-finder.js
index 9ede351..3658fed 100644
--- a/app/components/bridge-finder.js
+++ b/app/components/bridge-finder.js
@@ -1,8 +1,7 @@
 import Em from 'ember';
 
 export default Em.Component.extend({
-  classNames: ['container'],
-  elementId: 'finderContainer',
+  classNames: ['container-fluid', 'bridgeFinder'],
 
   bridgeIp: null,
   trial: false,
diff --git a/app/components/huegasm-app.js b/app/components/huegasm-app.js
index 4314a35..34d0b48 100644
--- a/app/components/huegasm-app.js
+++ b/app/components/huegasm-app.js
@@ -1,7 +1,7 @@
 import Em from 'ember';
 
 export default Em.Component.extend({
-  classNames: ['container-fluid', 'maxHeight'],
+  classNames: ['container-fluid'],
   bridgeIp: null,
 
   bridgeUsername: null,
diff --git a/app/styles/app.scss b/app/styles/app.scss
index e94f075..35445a3 100644
--- a/app/styles/app.scss
+++ b/app/styles/app.scss
@@ -8,16 +8,18 @@ $playerHeight: 400px;
 $playerBeatAreaHeight: 320px;
 $playListBackgroundColor: #1E1E1E;
 $playerDefaultIconColor: #BBBBBB;
+$footerHeight: 40px;
 
 // BRIDGE FINDER
-html, body {
-  margin: 0;
-  padding: 0;
-  height: 100%;
+html {
+  min-height: 100%;
+  height: auto;
 }
 
-.maxHeight {
-  height: 100%
+body {
+  margin-bottom: $footerHeight;
+  position: static;
+  height: auto;
 }
 
 .ember-app {
@@ -28,6 +30,7 @@ html, body {
   position: absolute;
   bottom: 0;
   width: 100%;
+  height: $footerHeight;
 }
 
 .footer .text-muted {
@@ -40,12 +43,12 @@ html, body {
   cursor: pointer;
 }
 
-#finderContainer {
+.bridgeFinder {
   text-align: center;
   padding-top: 20px;
 }
 
-#finderContainer .title {
+.bridgeFinder .title {
   font-family: 'Slabo 27px', serif;
   font-size: 30px;
   margin-bottom: 30px;
@@ -71,10 +74,6 @@ md-progress-circular {
   text-decoration: none;
 }
 
-md-content {
-  max-width: 1000px;
-}
-
 // BRIDGE CONTROLS
 .bridgeControls {
   position: relative;
diff --git a/app/templates/components/bridge-controls.hbs b/app/templates/components/bridge-controls.hbs
index 8eeef62..a898062 100644
--- a/app/templates/components/bridge-controls.hbs
+++ b/app/templates/components/bridge-controls.hbs
@@ -1,7 +1,7 @@
 {{#if ready}}
 
   {{controls/group-control lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData}}
-  
+
   <div class="navigation">
     {{#each tabData as |tab|}}
         <span class="navigationItem cursorPointer {{if tab.selected "active" ""}} text-uppercase" {{action "changeTab" tab.name}}>{{tab.name}}</span>
@@ -15,6 +15,4 @@
   {{#if musicTabSelected class="tabSwitch"}}
     {{controls/music-control apiURL=apiURL lightsData=lightsData  activeLights=activeLights}}
   {{/if}}
-
-  {{huegasm-footer}}
 {{/if}}
\ No newline at end of file
diff --git a/app/templates/components/huegasm-app.hbs b/app/templates/components/huegasm-app.hbs
index 2fd4e2b..9062077 100644
--- a/app/templates/components/huegasm-app.hbs
+++ b/app/templates/components/huegasm-app.hbs
@@ -4,6 +4,4 @@
   {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
 {{/if}}
 
-{{#unless bridgeUsername}}
-  {{huegasm-footer}}
-{{/unless}}
+{{huegasm-footer}}
\ No newline at end of file