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

Small styling things...simplify

Browse source
This commit is contained in:
Egor Philippov 2015-10-16 16:57:49 -07:00
parent cf57301693
commit 786903a224
3 changed files with 22 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,8 +9,7 @@
<div id="settings" class="col-sm-3 col-xs-5">
<div class="settingsItem">
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Light Groups
<div class="text-center">{{paper-icon icon="group"}}</div>
Light Groups <span class="caret"></span>
</span>
{{groups-list lightsData=lightsData groupsData=groupsData activeLights=activeLights apiURL=apiURL updateGroupsData=updateGroupsData groupControlDisplayed=groupControlDisplayed}}
@ -18,13 +17,12 @@
<div class="settingsItem">
<span data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Settings
<div class="text-center">{{paper-icon icon="settings"}}</div>
Settings <span class="caret"></span>
</span>
<ul id="appSettings" class="dropdown-menu">
<li class="appSettingsItem" {{action "clearBridge"}}>Switch bridge</li>
<li class="warn appSettingsItem" {{action "clearAllSettings"}}>Clear application settings</li>
<li {{action "clearBridge"}}><a href="#">Switch bridge</a></li>
<li {{action "clearAllSettings"}}><a href="#">Clear application settings</a></li>
</ul>
</div>
</div>

2
app/pods/components/music-tab/template.hbs
View file

@ -35,7 +35,7 @@
<div id="playListControls">
{{#if usingLocalAudio}}
<button class="btn btn-default dropdown-toggle pull-right" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<button class="dropdown-toggle pull-right addNewMusic" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Add new music
<span class="caret"></span>
</button>

46
app/styles/app.scss
View file

@ -65,26 +65,6 @@ md-switch[disabled=disabled], md-switch[disabled=disabled] .md-container, md-sli
transition: 0.1s all ease-in-out;
}
.appSettingsItem {
padding: 10px;
transition: 0.1s all ease-in-out;
cursor: pointer;
}
.appSettingsItem.warn {
text-transform: uppercase;
background: rgba(255, 0, 0, 0.20);
}
.appSettingsItem.warn:hover {
background: rgba(255, 0, 0, 0.70);
color: white;
}
.appSettingsItem:hover {
background: darken(white, 20%);
}
.settingsItem span:hover {
text-decoration: underline;
md-icon.group {
@ -161,10 +141,9 @@ md-progress-linear {
position: absolute;
background: white;
box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, 0.3);
width: 210px;
left: -172px;
top: 44px;
padding: 0;
width: 175px;
left: -115px;
top: 20px;
border: none;
color: black;
}
@ -183,6 +162,10 @@ md-list-item .md-no-style {
padding: 0;
}
.lightsTab {
min-height: 400px;
}
.lightsTab * .tooltip {
left: -20px !important;
}
@ -265,8 +248,8 @@ md-slider.md-default-theme .md-thumb:after {
box-shadow: 5px 10px 15px 5px rgba(0, 0, 0, 0.3);
border-radius: 0 0 5px 5px;
width: 300px;
top: 40px;
left: -245px;
top: 20px;
left: -215px;
position: absolute;
background-color: white;
max-height: 400px;
@ -996,8 +979,6 @@ body.dimmerOn {
}
body.dimmerOn #bridgeInput label,
.group.dimmerOn,
.settings.dimmerOn,
.power-settings-new.dimmerOn,
.brightness-4.dimmerOn,
.color-lens.dimmerOn,
@ -1073,6 +1054,13 @@ button.md-warn {
top: 28px;
}
.dropdown-toggle {
.addNewMusic {
padding: 4px;
background: none;
color: $playerDefaultIconColor;
border: none;
}
.addNewMusic:hover {
color: lighten($playerDefaultIconColor, 30%);
}