From 9d89aa329cd8b2c3d152daa8705d8ff1786f826e Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 2 Feb 2021 21:17:38 +0100 Subject: [PATCH] Revert "Add icon support to gauge" (#8303) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Joakim Sørensen --- src/panels/lovelace/cards/hui-gauge-card.ts | 26 +++--------- src/panels/lovelace/cards/types.ts | 1 - .../config-elements/hui-gauge-card-editor.ts | 41 +++++-------------- 3 files changed, 15 insertions(+), 53 deletions(-) diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts index f760bb2720..48e49d6432 100644 --- a/src/panels/lovelace/cards/hui-gauge-card.ts +++ b/src/panels/lovelace/cards/hui-gauge-card.ts @@ -14,7 +14,6 @@ import { styleMap } from "lit-html/directives/style-map"; import { applyThemesOnElement } from "../../../common/dom/apply_themes_on_element"; import { fireEvent } from "../../../common/dom/fire_event"; import { computeStateName } from "../../../common/entity/compute_state_name"; -import { stateIcon } from "../../../common/entity/state_icon"; import { isValidEntityId } from "../../../common/entity/valid_entity_id"; import "../../../components/ha-card"; import "../../../components/ha-gauge"; @@ -140,11 +139,8 @@ class HuiGaugeCard extends LitElement implements LovelaceCard { "--gauge-color": this._computeSeverity(state), })} > -
- -
- ${this._config.name || computeStateName(stateObj)} -
+
+ ${this._config.name || computeStateName(stateObj)}
`; @@ -236,25 +232,13 @@ class HuiGaugeCard extends LitElement implements LovelaceCard { max-width: 250px; } - .row { - display: flex; - justify-content: space-around; - margin-top: 4px; - align-items: center; - } - .name { text-align: center; line-height: initial; - color: var(--secondary-text-color); + color: var(--primary-text-color); width: 100%; - font-size: 16px; - font-weight: 500; - } - - ha-icon { - color: var(--state-icon-color, #44739e); - margin-right: 4px; + font-size: 15px; + margin-top: 8px; } `; } diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts index 3c0d104639..05330f9dbf 100644 --- a/src/panels/lovelace/cards/types.ts +++ b/src/panels/lovelace/cards/types.ts @@ -115,7 +115,6 @@ export interface GaugeCardConfig extends LovelaceCardConfig { max?: number; severity?: SeverityConfig; theme?: string; - icon?: string; } export interface ConfigEntity extends EntityConfig { diff --git a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts index da0147c5e2..7c12ea1fce 100644 --- a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts @@ -12,10 +12,8 @@ import { import { assert, number, object, optional, string } from "superstruct"; import { fireEvent } from "../../../../common/dom/fire_event"; import { computeRTLDirection } from "../../../../common/util/compute_rtl"; -import { stateIcon } from "../../../../common/entity/state_icon"; import "../../../../components/ha-formfield"; import "../../../../components/ha-switch"; -import "../../../../components/ha-icon-input"; import { HomeAssistant } from "../../../../types"; import { GaugeCardConfig, SeverityConfig } from "../../cards/types"; import "../../components/hui-entity-editor"; @@ -33,7 +31,6 @@ const cardConfigStruct = object({ max: optional(number()), severity: optional(object()), theme: optional(string()), - icon: optional(string()), }); const includeDomains = ["sensor"]; @@ -78,10 +75,6 @@ export class HuiGaugeCardEditor extends LitElement return this._config!.severity || undefined; } - get _icon(): string { - return this._config!.icon || ""; - } - protected render(): TemplateResult { if (!this.hass || !this._config) { return html``; @@ -112,30 +105,16 @@ export class HuiGaugeCardEditor extends LitElement .configValue=${"name"} @value-changed="${this._valueChanged}" > -
- - -
+