lone-cloud/huegasm
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Footer nightmare = solved

Browse source
This commit is contained in:
lone-cloud 2015-09-10 11:06:28 -07:00
parent ec1719365f
commit 849561224d
6 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/components/bridge-controls.js
View file

@ -1,7 +1,7 @@
import Em from 'ember'; import Em from 'ember';
export default Em.Component.extend({ export default Em.Component.extend({
classNames: ['bridgeControls', 'maxHeight'], classNames: ['bridgeControls'],
bridgeIp: null, bridgeIp: null,
manualBridgeIp: null, manualBridgeIp: null,

3
app/components/bridge-finder.js
View file

@ -1,8 +1,7 @@
import Em from 'ember'; import Em from 'ember';
export default Em.Component.extend({ export default Em.Component.extend({
classNames: ['container'], classNames: ['container-fluid', 'bridgeFinder'],
elementId: 'finderContainer',
bridgeIp: null, bridgeIp: null,
trial: false, trial: false,

2
app/components/huegasm-app.js
View file

@ -1,7 +1,7 @@
import Em from 'ember'; import Em from 'ember';
export default Em.Component.extend({ export default Em.Component.extend({
classNames: ['container-fluid', 'maxHeight'], classNames: ['container-fluid'],
bridgeIp: null, bridgeIp: null,
bridgeUsername: null, bridgeUsername: null,

23
app/styles/app.scss
View file

@ -8,16 +8,18 @@ $playerHeight: 400px;
$playerBeatAreaHeight: 320px; $playerBeatAreaHeight: 320px;
$playListBackgroundColor: #1E1E1E; $playListBackgroundColor: #1E1E1E;
$playerDefaultIconColor: #BBBBBB; $playerDefaultIconColor: #BBBBBB;
$footerHeight: 40px;
// BRIDGE FINDER // BRIDGE FINDER
html, body { html {
margin: 0; min-height: 100%;
padding: 0; height: auto;
height: 100%;
} }
.maxHeight { body {
height: 100% margin-bottom: $footerHeight;
position: static;
height: auto;
} }
.ember-app { .ember-app {
@ -28,6 +30,7 @@ html, body {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: $footerHeight;
} }
.footer .text-muted { .footer .text-muted {
@ -40,12 +43,12 @@ html, body {
cursor: pointer; cursor: pointer;
} }
#finderContainer { .bridgeFinder {
text-align: center; text-align: center;
padding-top: 20px; padding-top: 20px;
} }
#finderContainer .title { .bridgeFinder .title {
font-family: 'Slabo 27px', serif; font-family: 'Slabo 27px', serif;
font-size: 30px; font-size: 30px;
margin-bottom: 30px; margin-bottom: 30px;
@ -71,10 +74,6 @@ md-progress-circular {
text-decoration: none; text-decoration: none;
} }
md-content {
max-width: 1000px;
}
// BRIDGE CONTROLS // BRIDGE CONTROLS
.bridgeControls { .bridgeControls {
position: relative; position: relative;

2
app/templates/components/bridge-controls.hbs
View file

@ -15,6 +15,4 @@
{{#if musicTabSelected class="tabSwitch"}} {{#if musicTabSelected class="tabSwitch"}}
{{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}} {{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
{{/if}} {{/if}}
{{huegasm-footer}}
{{/if}} {{/if}}

4
app/templates/components/huegasm-app.hbs
View file

@ -4,6 +4,4 @@
{{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}} {{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
{{/if}} {{/if}}
{{#unless bridgeUsername}} {{huegasm-footer}}
{{huegasm-footer}}
{{/unless}}