diff --git a/src/panels/config/cloud/account/cloud-account.ts b/src/panels/config/cloud/account/cloud-account.ts index a1946add28..293576fa8f 100644 --- a/src/panels/config/cloud/account/cloud-account.ts +++ b/src/panels/config/cloud/account/cloud-account.ts @@ -1,6 +1,4 @@ import "@material/mwc-button"; -import "@material/mwc-list/mwc-list-item"; -import "@polymer/paper-item/paper-item-body"; import { css, html, LitElement, PropertyValues } from "lit"; import { customElement, property, state } from "lit/decorators"; import { formatDateTime } from "../../../../common/datetime/format_date_time"; @@ -10,6 +8,7 @@ import { debounce } from "../../../../common/util/debounce"; import "../../../../components/ha-alert"; import "../../../../components/ha-card"; import "../../../../components/ha-tip"; +import "../../../../components/ha-list-item"; import { cloudLogout, CloudStatusLoggedIn, @@ -65,12 +64,12 @@ export class CloudAccount extends SubscribeMixin(LitElement) { )} >
- + ${this.cloudStatus.email.replace( /(\w{3})[\w.-]+@([\w.]+\w)/, "$1***@$2" )} -
+ ${this._subscription ? this._subscription.human_description.replace( "{periodEnd}", @@ -87,8 +86,8 @@ export class CloudAccount extends SubscribeMixin(LitElement) { : this.hass.localize( "ui.panel.config.cloud.account.fetching_subscription" )} -
-
+ +
${this.cloudStatus.cloud === "connecting" && @@ -103,12 +102,10 @@ export class CloudAccount extends SubscribeMixin(LitElement) { : ""}
- + ${this.hass.localize( "ui.panel.config.cloud.account.connection_status" - )} - -
+ )}: ${this.cloudStatus.cloud === "connected" ? this.hass.localize( "ui.panel.config.cloud.account.connected" @@ -120,7 +117,7 @@ export class CloudAccount extends SubscribeMixin(LitElement) { : this.hass.localize( "ui.panel.config.cloud.account.connecting" )} -
+
diff --git a/src/panels/config/cloud/login/cloud-login.ts b/src/panels/config/cloud/login/cloud-login.ts index 696b70fb08..3b468707eb 100644 --- a/src/panels/config/cloud/login/cloud-login.ts +++ b/src/panels/config/cloud/login/cloud-login.ts @@ -1,6 +1,5 @@ import "@material/mwc-button"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; +import "@material/mwc-list/mwc-list"; import { css, html, LitElement, TemplateResult } from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; @@ -9,6 +8,7 @@ import "../../../../components/buttons/ha-progress-button"; import "../../../../components/ha-alert"; import "../../../../components/ha-card"; import "../../../../components/ha-icon-next"; +import "../../../../components/ha-list-item"; import type { HaTextField } from "../../../../components/ha-textfield"; import "../../../../components/ha-textfield"; import { cloudLogin } from "../../../../data/cloud"; @@ -166,19 +166,19 @@ export class CloudLogin extends LitElement { - - + + ${this.hass.localize( "ui.panel.config.cloud.login.start_trial" )} -
+ ${this.hass.localize( "ui.panel.config.cloud.login.trial_info" )} -
-
- -
+ + + +
@@ -293,9 +293,6 @@ export class CloudLogin extends LitElement { [slot="introduction"] a { color: var(--primary-color); } - paper-item { - cursor: pointer; - } ha-card { overflow: hidden; } diff --git a/src/panels/config/devices/device-detail/ha-device-entities-card.ts b/src/panels/config/devices/device-detail/ha-device-entities-card.ts index 9de2c1e69a..cbd64a0d1f 100644 --- a/src/panels/config/devices/device-detail/ha-device-entities-card.ts +++ b/src/panels/config/devices/device-detail/ha-device-entities-card.ts @@ -1,6 +1,4 @@ -import "@polymer/paper-item/paper-icon-item"; -import "@polymer/paper-item/paper-item"; -import "@polymer/paper-item/paper-item-body"; +import "@material/mwc-list/mwc-list"; import { css, CSSResultGroup, @@ -17,6 +15,7 @@ import { stripPrefixFromEntityName } from "../../../../common/entity/strip_prefi import "../../../../components/entity/state-badge"; import "../../../../components/ha-card"; import "../../../../components/ha-icon"; +import "../../../../components/ha-list-item"; import { ExtEntityRegistryEntry, getExtendedEntityRegistryEntry, @@ -91,11 +90,13 @@ export class HaDeviceEntitiesCard extends LitElement { return html`
- ${shownEntities.map((entry) => - this.hass.states[entry.entity_id] - ? this._renderEntity(entry) - : this._renderEntry(entry) - )} + + ${shownEntities.map((entry) => + this.hass.states[entry.entity_id] + ? this._renderEntity(entry) + : this._renderEntry(entry) + )} +
${hiddenEntities.length ? !this.showHidden @@ -108,7 +109,9 @@ export class HaDeviceEntitiesCard extends LitElement { ` : html` - ${hiddenEntities.map((entry) => this._renderEntry(entry))} + + ${hiddenEntities.map((entry) => this._renderEntry(entry))} +