From d5ed1c4c418426a827fa3b53e00ce14975edd676 Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 1 Apr 2020 17:26:38 +0200
Subject: [PATCH] Clean up theme settings (#5395)

---
 src/panels/lovelace/cards/hui-button-card.ts                | 1 -
 src/panels/lovelace/cards/hui-entities-card.ts              | 2 +-
 src/panels/lovelace/cards/hui-gauge-card.ts                 | 2 +-
 src/panels/lovelace/cards/hui-glance-card.ts                | 2 +-
 src/panels/lovelace/cards/hui-history-graph-card.ts         | 2 +-
 src/panels/lovelace/cards/hui-light-card.ts                 | 1 -
 src/panels/lovelace/cards/hui-media-control-card.ts         | 2 +-
 src/panels/lovelace/cards/hui-sensor-card.ts                | 1 -
 src/panels/lovelace/cards/hui-thermostat-card.ts            | 2 +-
 .../editor/config-elements/hui-alarm-panel-card-editor.ts   | 2 +-
 .../editor/config-elements/hui-button-card-editor.ts        | 2 +-
 .../editor/config-elements/hui-entities-card-editor.ts      | 2 +-
 .../editor/config-elements/hui-entity-card-editor.ts        | 4 ++--
 .../editor/config-elements/hui-gauge-card-editor.ts         | 2 +-
 .../editor/config-elements/hui-glance-card-editor.ts        | 2 +-
 .../editor/config-elements/hui-light-card-editor.ts         | 2 +-
 .../editor/config-elements/hui-markdown-card-editor.ts      | 2 +-
 .../editor/config-elements/hui-picture-card-editor.ts       | 2 +-
 .../config-elements/hui-picture-entity-card-editor.ts       | 2 +-
 .../config-elements/hui-picture-glance-card-editor.ts       | 2 +-
 .../editor/config-elements/hui-plant-status-card-editor.ts  | 2 +-
 .../editor/config-elements/hui-sensor-card-editor.ts        | 2 +-
 .../editor/config-elements/hui-shopping-list-editor.ts      | 2 +-
 .../editor/config-elements/hui-thermostat-card-editor.ts    | 2 +-
 .../config-elements/hui-weather-forecast-card-editor.ts     | 2 +-
 src/panels/lovelace/views/hui-view.ts                       | 6 +++++-
 26 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 250a90b8ea..0f61dcb643 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -82,7 +82,6 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
     }
 
     this._config = {
-      theme: "default",
       hold_action: { action: "more-info" },
       double_tap_action: { action: "none" },
       show_icon: true,
diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts
index 954d10c00e..833278454a 100644
--- a/src/panels/lovelace/cards/hui-entities-card.ts
+++ b/src/panels/lovelace/cards/hui-entities-card.ts
@@ -93,7 +93,7 @@ class HuiEntitiesCard extends LitElement implements LovelaceCard {
   public setConfig(config: EntitiesCardConfig): void {
     const entities = processConfigEntities(config.entities);
 
-    this._config = { theme: "default", ...config };
+    this._config = config;
     this._configEntities = entities;
     if (config.show_header_toggle === undefined) {
       // Default value is show toggle if we can at least toggle 2 entities.
diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts
index 59fb921970..74a4ba1100 100644
--- a/src/panels/lovelace/cards/hui-gauge-card.ts
+++ b/src/panels/lovelace/cards/hui-gauge-card.ts
@@ -82,7 +82,7 @@ class HuiGaugeCard extends LitElement implements LovelaceCard {
     if (!isValidEntityId(config.entity)) {
       throw new Error("Invalid Entity");
     }
-    this._config = { min: 0, max: 100, theme: "default", ...config };
+    this._config = { min: 0, max: 100, ...config };
   }
 
   public connectedCallback(): void {
diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts
index 5062eb4c11..c892148259 100644
--- a/src/panels/lovelace/cards/hui-glance-card.ts
+++ b/src/panels/lovelace/cards/hui-glance-card.ts
@@ -74,7 +74,7 @@ export class HuiGlanceCard extends LitElement implements LovelaceCard {
   }
 
   public setConfig(config: GlanceCardConfig): void {
-    this._config = { theme: "default", state_color: true, ...config };
+    this._config = { state_color: true, ...config };
     const entities = processConfigEntities<GlanceConfigEntity>(config.entities);
 
     for (const entity of entities) {
diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts
index cd7d756fb1..c38bf1a98a 100644
--- a/src/panels/lovelace/cards/hui-history-graph-card.ts
+++ b/src/panels/lovelace/cards/hui-history-graph-card.ts
@@ -70,7 +70,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard {
       throw new Error("Entities need to be an array");
     }
 
-    this._config = { theme: "default", ...config };
+    this._config = config;
     this._configEntities = config.entities
       ? processConfigEntities(config.entities)
       : [];
diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts
index 23b2b46427..70e807d45e 100644
--- a/src/panels/lovelace/cards/hui-light-card.ts
+++ b/src/panels/lovelace/cards/hui-light-card.ts
@@ -78,7 +78,6 @@ export class HuiLightCard extends LitElement implements LovelaceCard {
     }
 
     this._config = {
-      theme: "default",
       ...config,
       tap_action: { action: "toggle" },
     };
diff --git a/src/panels/lovelace/cards/hui-media-control-card.ts b/src/panels/lovelace/cards/hui-media-control-card.ts
index 63e16b9e16..9e60be8de2 100644
--- a/src/panels/lovelace/cards/hui-media-control-card.ts
+++ b/src/panels/lovelace/cards/hui-media-control-card.ts
@@ -212,7 +212,7 @@ export class HuiMediaControlCard extends LitElement implements LovelaceCard {
       throw new Error("Specify an entity from within the media_player domain.");
     }
 
-    this._config = { theme: "default", ...config };
+    this._config = config;
   }
 
   public connectedCallback(): void {
diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts
index 2d5858d49f..d49c21d729 100644
--- a/src/panels/lovelace/cards/hui-sensor-card.ts
+++ b/src/panels/lovelace/cards/hui-sensor-card.ts
@@ -217,7 +217,6 @@ class HuiSensorCard extends LitElement implements LovelaceCard {
 
     const cardConfig = {
       detail: 1,
-      theme: "default",
       hours_to_show: 24,
       ...config,
     };
diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts
index fe8161ecc0..f6f3a73866 100644
--- a/src/panels/lovelace/cards/hui-thermostat-card.ts
+++ b/src/panels/lovelace/cards/hui-thermostat-card.ts
@@ -87,7 +87,7 @@ export class HuiThermostatCard extends LitElement implements LovelaceCard {
       throw new Error("Specify an entity from within the climate domain.");
     }
 
-    this._config = { theme: "default", ...config };
+    this._config = config;
   }
 
   public connectedCallback(): void {
diff --git a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
index b1e1a1f342..a849401772 100644
--- a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts
@@ -56,7 +56,7 @@ export class HuiAlarmPanelCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
index f8f292bb0e..fc80cde874 100644
--- a/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-button-card-editor.ts
@@ -84,7 +84,7 @@ export class HuiButtonCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "default";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
index 0fd383e2ba..02cd1b8574 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts
@@ -63,7 +63,7 @@ export class HuiEntitiesCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
index 7352d3e75e..511be106e3 100644
--- a/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-entity-card-editor.ts
@@ -65,7 +65,7 @@ export class HuiEntityCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "default";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
@@ -136,7 +136,7 @@ export class HuiEntityCardEditor extends LitElement
           .hass=${this.hass}
           .value=${this._theme}
           .configValue=${"theme"}
-          @theme-changed=${this._valueChanged}
+          @value-changed=${this._valueChanged}
         ></hui-theme-select-editor>
       </div>
     `;
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 178dd504f6..8e17c179cd 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
@@ -57,7 +57,7 @@ export class HuiGaugeCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "default";
+    return this._config!.theme || "";
   }
 
   get _min(): number {
diff --git a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
index 5ec82a3237..a4cb511a20 100644
--- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts
@@ -60,7 +60,7 @@ export class HuiGlanceCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   get _columns(): number {
diff --git a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
index 161aba745d..3564980a63 100644
--- a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts
@@ -52,7 +52,7 @@ export class HuiLightCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "default";
+    return this._config!.theme || "";
   }
 
   get _entity(): string {
diff --git a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
index f5b56e201c..507bf9536e 100644
--- a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts
@@ -46,7 +46,7 @@ export class HuiMarkdownCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
index 6b86440d07..2a17fe107f 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts
@@ -56,7 +56,7 @@ export class HuiPictureCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
index e81e2b114d..bd63fcd92d 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-entity-card-editor.ts
@@ -96,7 +96,7 @@ export class HuiPictureEntityCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
index d9d1c2c48a..d87225615f 100644
--- a/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-picture-glance-card-editor.ts
@@ -107,7 +107,7 @@ export class HuiPictureGlanceCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
index ef84475b34..96acf94aaa 100644
--- a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts
@@ -47,7 +47,7 @@ export class HuiPlantStatusCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts
index cf861ca1ae..f608df420b 100644
--- a/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts
@@ -70,7 +70,7 @@ export class HuiSensorCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "default";
+    return this._config!.theme || "";
   }
 
   get _hours_to_show(): number | string {
diff --git a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
index 3770e66ab5..b6f656a2fb 100644
--- a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts
@@ -42,7 +42,7 @@ export class HuiShoppingListEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
index 862613d987..8372fda9df 100644
--- a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts
@@ -46,7 +46,7 @@ export class HuiThermostatCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "default";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
index d4ae31d7ea..408091c741 100644
--- a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
+++ b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts
@@ -45,7 +45,7 @@ export class HuiWeatherForecastCardEditor extends LitElement
   }
 
   get _theme(): string {
-    return this._config!.theme || "Backend-selected";
+    return this._config!.theme || "";
   }
 
   protected render(): TemplateResult {
diff --git a/src/panels/lovelace/views/hui-view.ts b/src/panels/lovelace/views/hui-view.ts
index e0d7c087de..9ecbeb3163 100644
--- a/src/panels/lovelace/views/hui-view.ts
+++ b/src/panels/lovelace/views/hui-view.ts
@@ -117,7 +117,11 @@ export class HUIView extends LitElement {
           padding: 4px 4px 0;
           transform: translateZ(0);
           position: relative;
-          background: var(--lovelace-background);
+          color: var(--primary-text-color);
+          background: var(
+            --lovelace-background,
+            var(--primary-background-color)
+          );
         }
 
         #badges {