From 32c403d069567e2c47ca05885b9bcc854ddca4da Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Wed, 28 Feb 2024 11:52:45 +0100 Subject: [PATCH] Replace more paper-items (#19707) Remove leftover paper items --- .../dialog-hassio-repositories.ts | 85 ++++++++++--------- .../config/devices/ha-config-device-page.ts | 37 +++----- .../integration-panels/zha/zha-group-page.ts | 33 ++++--- src/panels/mailbox/ha-panel-mailbox.ts | 37 ++++---- 4 files changed, 93 insertions(+), 99 deletions(-) diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index 74ce8d5a6a..47f107a6c5 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -1,7 +1,5 @@ import "@material/mwc-button/mwc-button"; import { mdiDelete, mdiDeleteOff } from "@mdi/js"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; import { customElement, property, query, state } from "lit/decorators"; @@ -27,6 +25,8 @@ import type { HomeAssistant } from "../../../../src/types"; import { HassioRepositoryDialogParams } from "./show-dialog-repositories"; import type { HaTextField } from "../../../../src/components/ha-textfield"; import "../../../../src/components/ha-textfield"; +import "../../../../src/components/ha-list-new"; +import "../../../../src/components/ha-list-item-new"; @customElement("dialog-hassio-repositories") class HassioRepositoriesDialog extends LitElement { @@ -106,44 +106,46 @@ class HassioRepositoriesDialog extends LitElement { ? html`${this._error}` : ""}
- ${repositories.length - ? repositories.map( - (repo) => html` - - -
${repo.name}
-
${repo.maintainer}
-
${repo.url}
- -
- - - - ${this._dialogParams!.supervisor.localize( - usedRepositories.includes(repo.slug) - ? "dialog.repositories.used" - : "dialog.repositories.remove" - )} - -
- - ` - ) - : html` No repositories `} + + ${repositories.length + ? repositories.map( + (repo) => html` + + ${repo.name} +
+
${repo.maintainer}
+
${repo.url}
+
+
+ + + + ${this._dialogParams!.supervisor.localize( + usedRepositories.includes(repo.slug) + ? "dialog.repositories.used" + : "dialog.repositories.remove" + )} + +
+ + ` + ) + : html` No repositories `} +
- - - ${computeStateName(entityState)} - - - + ${computeStateName(entityState)} + + ${!entityState.attributes.id ? html` @@ -528,15 +527,14 @@ export class HaConfigDevicePage extends LitElement { : undefined )} > - - - ${computeStateName(entityState)} - - - + ${computeStateName(entityState)} + + ${!entityState.attributes.id ? html` @@ -623,12 +621,10 @@ export class HaConfigDevicePage extends LitElement { return entityState ? html` - - - ${computeStateName(entityState)} - - - + + ${computeStateName(entityState)} + + ` : ""; @@ -1518,11 +1514,6 @@ export class HaConfigDevicePage extends LitElement { margin-top: 0; } - paper-item { - cursor: pointer; - font-size: var(--paper-font-body1_-_font-size); - } - a { text-decoration: none; color: var(--primary-color); diff --git a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts index f21f688e07..0216d0a0df 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-group-page.ts @@ -1,6 +1,5 @@ import "@material/mwc-button"; import { mdiDelete } from "@mdi/js"; -import "@polymer/paper-item/paper-item"; import { CSSResultGroup, LitElement, @@ -32,6 +31,8 @@ import "../../../ha-config-section"; import { formatAsPaddedHex } from "./functions"; import "./zha-device-endpoint-data-table"; import type { ZHADeviceEndpointDataTable } from "./zha-device-endpoint-data-table"; +import "@material/mwc-list/mwc-list"; +import "../../../../../components/ha-list-item"; @customElement("zha-group-page") export class ZHAGroupPage extends LitElement { @@ -131,20 +132,24 @@ export class ZHAGroupPage extends LitElement { ${this.hass.localize("ui.panel.config.zha.groups.members")}
- ${this.group.members.length - ? this.group.members.map( - (member) => - html` - ${member.device.user_given_name || - member.device.name} + ${this.group.members.length + ? this.group.members.map( + (member) => + html` - ` - ) - : html` This group has no members `} + ${member.device.user_given_name || + member.device.name} + ` + ) + : html` + This group has no members + `} + ${this.group.members.length ? html` diff --git a/src/panels/mailbox/ha-panel-mailbox.ts b/src/panels/mailbox/ha-panel-mailbox.ts index 643112c7bd..250af9a83a 100644 --- a/src/panels/mailbox/ha-panel-mailbox.ts +++ b/src/panels/mailbox/ha-panel-mailbox.ts @@ -12,8 +12,6 @@ import { formatDateTime } from "../../common/datetime/format_date_time"; import "../../components/ha-card"; import "../../components/ha-menu-button"; import "../../components/ha-tabs"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; import "@polymer/paper-tabs/paper-tab"; import { HomeAssistant } from "../../types"; import { fireEvent } from "../../common/dom/fire_event"; @@ -82,25 +80,24 @@ class HaPanelMailbox extends LitElement { : nothing} ${this._messages?.map( (message) => - html` - -
-
${message.caller}
-
- ${formatDuration(this.hass.locale, { - seconds: message.duration, - })} -
-
-
- ${message.timestamp} - - ${message.message} -
- - ` + + ${message.caller} + + ${formatDuration(this.hass.locale, { + seconds: message.duration, + })} + + + + ${message.timestamp} - + ${message.message} + + ` )}
@@ -219,10 +216,6 @@ class HaPanelMailbox extends LitElement { overflow: hidden; } - paper-item { - cursor: pointer; - } - ha-tabs { margin-left: max(env(safe-area-inset-left), 24px); margin-right: max(env(safe-area-inset-right), 24px);