diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index 5c7aba3f3b..6328c68c9c 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -1,14 +1,11 @@ import { ActionDetail } from "@material/mwc-list/mwc-list-foundation"; -import "@material/mwc-list/mwc-list-item"; +import "@material/mwc-list/mwc-list"; import { mdiContentDuplicate, mdiContentSave, mdiDelete, mdiDotsVertical, } from "@mdi/js"; -import "@polymer/paper-item/paper-icon-item"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; import { HassEvent } from "home-assistant-js-websocket"; import { css, @@ -35,6 +32,7 @@ import "../../../components/ha-card"; import "../../../components/ha-fab"; import "../../../components/ha-icon-button"; import "../../../components/ha-icon-picker"; +import "../../../components/ha-list-item"; import "../../../components/ha-svg-icon"; import "../../../components/ha-textfield"; import { @@ -238,7 +236,7 @@ export class HaSceneEditor extends SubscribeMixin( .path=${mdiDotsVertical} > - + ${this.hass.localize( "ui.panel.config.scene.picker.duplicate_scene" )} @@ -246,9 +244,9 @@ export class HaSceneEditor extends SubscribeMixin( slot="graphic" .path=${mdiContentDuplicate} > - + - - + ${this._errors ? html`
${this._errors}
` : ""}
- ${device.entities.map((entityId) => { - const entityStateObj = this.hass.states[entityId]; - if (!entityStateObj) { - return nothing; - } - return html` - - - + + ${device.entities.map((entityId) => { + const entityStateObj = this.hass.states[entityId]; + if (!entityStateObj) { + return nothing; + } + return html` + + ${computeStateName(entityStateObj)} - - - `; - })} + + `; + })} + ` )} @@ -402,36 +401,39 @@ export class HaSceneEditor extends SubscribeMixin( "ui.panel.config.scene.editor.entities.without_device" )} > - ${entities.map((entityId) => { - const entityStateObj = - this.hass.states[entityId]; - if (!entityStateObj) { - return nothing; - } - return html` - - - - ${computeStateName(entityStateObj)} - - + ${entities.map((entityId) => { + const entityStateObj = + this.hass.states[entityId]; + if (!entityStateObj) { + return nothing; + } + return html` + - - `; - })} + @click=${this._showMoreInfo} + > + + ${computeStateName(entityStateObj)} +
+ +
+ + `; + })} + ` : ""} @@ -966,35 +968,6 @@ export class HaSceneEditor extends SubscribeMixin( ha-config-section:last-child { padding-bottom: 20px; } - .triggers, - .script { - margin-top: -16px; - } - .triggers ha-card, - .script ha-card { - margin-top: 16px; - } - .add-card mwc-button { - display: block; - text-align: center; - } - .card-menu { - position: absolute; - top: 0; - right: 0; - z-index: 1; - color: var(--primary-text-color); - } - .rtl .card-menu { - right: auto; - left: 0; - } - .card-menu paper-item { - cursor: pointer; - } - paper-icon-item { - padding: 8px 16px; - } ha-card ha-icon-button { color: var(--secondary-text-color); } @@ -1003,9 +976,6 @@ export class HaSceneEditor extends SubscribeMixin( position: relative; top: -8px; } - .device-entity { - cursor: pointer; - } span[slot="introduction"] a { color: var(--primary-color); } @@ -1029,6 +999,11 @@ export class HaSceneEditor extends SubscribeMixin( ha-textfield { display: block; } + div[slot="meta"] { + display: flex; + justify-content: center; + align-items: center; + } `, ]; }