Update compiled frontend with latest changes

This commit is contained in:
Paulus Schoutsen 2014-11-04 20:24:48 -08:00
parent ac2389a0a5
commit 3c37f491b2
2 changed files with 25 additions and 9 deletions

View File

@ -1,2 +1,2 @@
""" DO NOT MODIFY. Auto-generated by build_frontend script """ """ DO NOT MODIFY. Auto-generated by build_frontend script """
VERSION = "52df22ae159b45a14b265b26a6f4ff55" VERSION = "eabfdd5cb0e712c8d6d5d837fb9bfeb9"

View File

@ -17810,7 +17810,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
</style> </style>
<div horizontal="" layout="" center=""> <div horizontal="" layout="" center="">
<domain-icon id="icon" domain="{{stateObj.domain}}" state="{{stateObj.state}}"> <domain-icon id="icon" domain="{{stateObj.domain}}" data-domain="{{stateObj.domain}}" state="{{stateObj.state}}" data-state="{{stateObj.state}}">
</domain-icon> </domain-icon>
<div fit="" id="picture"></div> <div fit="" id="picture"></div>
</div> </div>
@ -17819,26 +17819,35 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<script> <script>
Polymer('state-badge',{ Polymer('state-badge',{
observe: { observe: {
'stateObj.state': 'stateChanged', 'stateObj.state': 'updateIconColor',
'stateObj.attributes.brightness': 'updateIconColor',
'stateObj.attributes.xy_color[0]': 'updateIconColor',
'stateObj.attributes.xy_color[1]': 'updateIconColor',
'stateObj.attributes.entity_picture': 'entityPictureChanged' 'stateObj.attributes.entity_picture': 'entityPictureChanged'
}, },
stateChanged: function(oldVal, newVal) { /**
* Called when an attribute changes that influences the color of the icon.
*/
updateIconColor: function(oldVal, newVal) {
var state = this.stateObj; var state = this.stateObj;
// for domain light, set color of icon to light color if available // for domain light, set color of icon to light color if available
if(state.domain == "light" && newVal == "on" && if(state.domain == "light" && state.state == "on" &&
state.attributes.brightness && state.attributes.xy_color) { state.attributes.brightness && state.attributes.xy_color) {
var rgb = this.xyBriToRgb(state.attributes.xy_color[0], var rgb = this.xyBriToRgb(state.attributes.xy_color[0],
state.attributes.xy_color[1], state.attributes.xy_color[1],
state.attributes.brightness); state.attributes.brightness);
this.style.color = "rgb(" + rgb.map(Math.floor).join(",") + ")"; this.$.icon.style.color = "rgb(" + rgb.map(Math.floor).join(",") + ")";
} else { } else {
this.style.color = 'white'; this.$.icon.style.color = null;
} }
}, },
/**
* Called when the attribute for entity_picture has changed.
*/
entityPictureChanged: function(oldVal, newVal) { entityPictureChanged: function(oldVal, newVal) {
if(newVal) { if(newVal) {
this.$.picture.style.backgroundImage = 'url(' + newVal + ')'; this.$.picture.style.backgroundImage = 'url(' + newVal + ')';
@ -18066,14 +18075,21 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
} }
state-card { state-card {
width: calc(50% - 42px); width: calc(50% - 44px);
margin: 8px 0 0 8px; margin: 8px 0 0 8px;
} }
} }
@media all and (min-width: 1100px) { @media all and (min-width: 1100px) {
state-card { state-card {
width: calc(33% - 37px); width: calc(33% - 38px);
}
}
@media all and (min-width: 1450px) {
state-card {
width: calc(25% - 42px);
} }
} }