fix rebasing

This commit is contained in:
Zack Arnett 2021-10-23 15:13:56 -05:00
parent 183dc3cfbe
commit c22d8ee669

View File

@ -147,8 +147,9 @@ export class HuiEntityCard extends LitElement implements LovelaceCard {
</div> </div>
` `
: html` : html`
<ha-icon <ha-state-icon
.icon=${this._config.icon || stateIcon(stateObj)} .icon=${this._config.icon}
.state=${stateObj}
data-domain=${ifDefined( data-domain=${ifDefined(
this._config.state_color || this._config.state_color ||
(domain === "light" && (domain === "light" &&
@ -157,7 +158,7 @@ export class HuiEntityCard extends LitElement implements LovelaceCard {
: undefined : undefined
)} )}
data-state=${stateObj ? computeActiveState(stateObj) : ""} data-state=${stateObj ? computeActiveState(stateObj) : ""}
></ha-icon> ></ha-state-icon>
`} `}
</div> </div>
</div> </div>