From 698beedaa2b15083099afb08077a5af0a2073240 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Tue, 16 Oct 2018 16:20:28 -0400 Subject: [PATCH 1/4] Changing Clance Column width default to fill card --- src/panels/lovelace/cards/hui-glance-card.ts | 36 +++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index 6f9f4fe5e8..42d7ff9b8e 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -62,9 +62,11 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement) } } + const columnWidth = config.entities.length > 4 ? "20%" : `${100 / config.entities.length}%` + this.style.setProperty( "--glance-column-width", - config.column_width || "20%" + config.column_width || columnWidth ); if (config.theming) { @@ -96,10 +98,10 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
${repeat( - entities, - (entityConf) => entityConf.entity, - (entityConf) => this.renderEntity(entityConf) - )} + entities, + (entityConf) => entityConf.entity, + (entityConf) => this.renderEntity(entityConf) + )}
`; @@ -158,23 +160,23 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement) @click="${this.handleClick}" > ${ - this.config!.show_name !== false - ? html`
${ - "name" in entityConf - ? entityConf.name - : computeStateName(stateObj) - }
` - : "" - } + this.config!.show_name !== false + ? html`
${ + "name" in entityConf + ? entityConf.name + : computeStateName(stateObj) + }
` + : "" + } ${ - this.config!.show_state !== false - ? html`
${computeStateDisplay(this.localize, stateObj)}
` - : "" - } + this.config!.show_state !== false + ? html`
${computeStateDisplay(this.localize, stateObj)}
` + : "" + } `; } From 35941a58a58f791a4676fb4e9c4ecbd54dc792a8 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Wed, 17 Oct 2018 11:11:29 -0400 Subject: [PATCH 2/4] Prettier Fixes --- src/panels/lovelace/cards/hui-glance-card.ts | 35 ++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index 42d7ff9b8e..6df5f548a0 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -62,7 +62,8 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement) } } - const columnWidth = config.entities.length > 4 ? "20%" : `${100 / config.entities.length}%` + const columnWidth = + config.entities.length > 4 ? "20%" : `${100 / config.entities.length}%`; this.style.setProperty( "--glance-column-width", @@ -98,10 +99,10 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement)
${repeat( - entities, - (entityConf) => entityConf.entity, - (entityConf) => this.renderEntity(entityConf) - )} + entities, + (entityConf) => entityConf.entity, + (entityConf) => this.renderEntity(entityConf) + )}
`; @@ -160,23 +161,23 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement) @click="${this.handleClick}" > ${ - this.config!.show_name !== false - ? html`
${ - "name" in entityConf - ? entityConf.name - : computeStateName(stateObj) - }
` - : "" - } + this.config!.show_name !== false + ? html`
${ + "name" in entityConf + ? entityConf.name + : computeStateName(stateObj) + }
` + : "" + } ${ - this.config!.show_state !== false - ? html`
${computeStateDisplay(this.localize, stateObj)}
` - : "" - } + this.config!.show_state !== false + ? html`
${computeStateDisplay(this.localize, stateObj)}
` + : "" + } `; } From 62d27a17d5d6486c8cf97248b9a872b7a4167e9a Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Wed, 17 Oct 2018 13:06:57 -0400 Subject: [PATCH 3/4] Takes out column width variable --- src/panels/lovelace/cards/hui-glance-card.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index 6df5f548a0..3a83fadfce 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -30,7 +30,6 @@ interface Config extends LovelaceConfig { show_name?: boolean; show_state?: boolean; title?: string; - column_width?: string; theming?: "primary"; entities: EntityConfig[]; } @@ -65,10 +64,7 @@ class HuiGlanceCard extends HassLocalizeLitMixin(LitElement) const columnWidth = config.entities.length > 4 ? "20%" : `${100 / config.entities.length}%`; - this.style.setProperty( - "--glance-column-width", - config.column_width || columnWidth - ); + this.style.setProperty("--glance-column-width", columnWidth); if (config.theming) { if (typeof config.theming !== "string") { From 4a7ff3cd94f30352e5b4aace332b7fab24283ed8 Mon Sep 17 00:00:00 2001 From: Zack Arnett Date: Thu, 18 Oct 2018 09:06:29 -0400 Subject: [PATCH 4/4] Removing Column width variable in interface --- src/panels/lovelace/cards/hui-glance-card.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index 9519113223..94c26cdc12 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -31,7 +31,6 @@ interface Config extends LovelaceConfig { show_name?: boolean; show_state?: boolean; title?: string; - column_width?: string; theme?: string; entities: EntityConfig[]; }