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

minor styling

Browse source
This commit is contained in:
Egor Philippov 2015-10-21 14:09:54 -07:00
parent 8fe37498f7
commit 090e2cd9c4
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/pods/components/hue-controls/component.js
View file

@ -37,7 +37,7 @@ export default Em.Component.extend({
didInsertElement(){ didInsertElement(){
// here's a weird way to automatically initialize bootstrap tooltips // here's a weird way to automatically initialize bootstrap tooltips
var self = this, observer = new MutationObserver(function(mutations) { var observer = new MutationObserver(function(mutations) {
var haveTooltip = !mutations.every(function(mutation) { var haveTooltip = !mutations.every(function(mutation) {
return Em.isEmpty(mutation.addedNodes) || Em.isNone(mutation.addedNodes[0].classList) || mutation.addedNodes[0].classList.contains('tooltip'); return Em.isEmpty(mutation.addedNodes) || Em.isNone(mutation.addedNodes[0].classList) || mutation.addedNodes[0].classList.contains('tooltip');
}); });

8
app/pods/components/hue-controls/template.hbs
View file

@ -1,14 +1,14 @@
{{#if ready}} {{#if ready}}
<div class="row navigation"> <div class="row navigation">
<div class="col-sm-5 col-sm-offset-4 col-xs-6 col-xs-offset-2"> <div class="col-sm-4 col-sm-offset-4 col-xs-6 col-xs-offset-2">
{{#each tabData as |tab|}} {{#each tabData as |tab|}}
<span class="navigationItem cursorPointer {{if tab.selected "active"}} text-uppercase" {{action "changeTab" tab.name}}>{{tab.name}}</span> <span class="navigationItem cursorPointer {{if tab.selected "active"}} text-uppercase" {{action "changeTab" tab.name}}>{{tab.name}}</span>
{{/each}} {{/each}}
</div> </div>
<div id="settings" class="col-sm-3 col-xs-4"> <div id="settings" class="col-xs-4">
<div class="settingsItem"> <div class="settingsItem">
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{paper-icon icon="group" class=dimmerOnClass}} Groups <span class="caret"></span> <span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{paper-icon icon="group" class=dimmerOnClass}}Groups <span class="caret"></span>
</span> </span>
{{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}} {{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}}
@ -16,7 +16,7 @@
<div class="settingsItem"> <div class="settingsItem">
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{paper-icon icon="settings" class=dimmerOnClass}} Settings <span class="caret"></span> {{paper-icon icon="settings" class=dimmerOnClass}}Settings <span class="caret"></span>
</span> </span>
<ul id="appSettings" class="dropdown-menu"> <ul id="appSettings" class="dropdown-menu">

7
app/styles/app.scss
View file

@ -67,7 +67,7 @@ md-progress-circular[md-mode=indeterminate] .md-spinner-wrapper {
span md-icon { span md-icon {
position: relative; position: relative;
bottom: 5px; bottom: 5px;
right: 5px; right: 10px;
} }
} }
@ -860,9 +860,12 @@ html.dimmerOn {
body.dimmerOn { body.dimmerOn {
color: white; color: white;
background: #242424; background: #242424;
.md-track, .color { .md-track {
background: white; background: white;
} }
.color {
border: 1px solid white;
}
.playlistItem { .playlistItem {
color: #cdcdcd; color: #cdcdcd;
background: #2D2D2D; background: #2D2D2D;