Footer nightmare = solved
This commit is contained in:
parent
ec1719365f
commit
849561224d
6 changed files with 16 additions and 22 deletions
|
|
@ -1,7 +1,7 @@
|
|||
import Em from 'ember';
|
||||
|
||||
export default Em.Component.extend({
|
||||
classNames: ['bridgeControls', 'maxHeight'],
|
||||
classNames: ['bridgeControls'],
|
||||
|
||||
bridgeIp: null,
|
||||
manualBridgeIp: null,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import Em from 'ember';
|
||||
|
||||
export default Em.Component.extend({
|
||||
classNames: ['container-fluid', 'maxHeight'],
|
||||
classNames: ['container-fluid'],
|
||||
bridgeIp: null,
|
||||
|
||||
bridgeUsername: null,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,4 @@
|
|||
{{#if musicTabSelected class="tabSwitch"}}
|
||||
{{controls/music-control apiURL=apiURL lightsData=lightsData activeLights=activeLights}}
|
||||
{{/if}}
|
||||
|
||||
{{huegasm-footer}}
|
||||
{{/if}}
|
||||
|
|
@ -4,6 +4,4 @@
|
|||
{{bridge-finder bridgeIp=bridgeIp bridgeUsername=bridgeUsername trial=trial}}
|
||||
{{/if}}
|
||||
|
||||
{{#unless bridgeUsername}}
|
||||
{{huegasm-footer}}
|
||||
{{/unless}}
|
||||
|
|
|
|||
Reference in a new issue