diff --git a/src/components/ha-theme-picker.ts b/src/components/ha-theme-picker.ts index 8835a5b186..ef619737b2 100644 --- a/src/components/ha-theme-picker.ts +++ b/src/components/ha-theme-picker.ts @@ -42,17 +42,15 @@ export class HaThemePicker extends LitElement { fixedMenuPosition naturalMenuWidth > - ${this.hass!.localize( - "ui.components.theme-picker.no_theme" - )} + + ${this.hass!.localize("ui.components.theme-picker.no_theme")} + ${this.includeDefault - ? html`${this.hass!.localize( - "ui.components.theme-picker.default" - )}` + ? html` + + Home Assistant + + ` : nothing} ${Object.keys(this.hass!.themes.themes) .sort() diff --git a/src/panels/profile/ha-pick-theme-row.ts b/src/panels/profile/ha-pick-theme-row.ts index 1677ff7e15..725955fe98 100644 --- a/src/panels/profile/ha-pick-theme-row.ts +++ b/src/panels/profile/ha-pick-theme-row.ts @@ -23,8 +23,8 @@ import { import { HomeAssistant } from "../../types"; import { documentationUrl } from "../../util/documentation-url"; -const BACKEND_SELECTED_THEME = "Backend-selected"; -const DEFAULT_THEME = "default"; +const USE_DEFAULT_THEME = "__USE_DEFAULT_THEME__"; +const HOME_ASSISTANT_THEME = "default"; @customElement("ha-pick-theme-row") export class HaPickThemeRow extends LitElement { @@ -68,15 +68,15 @@ export class HaPickThemeRow extends LitElement { - - ${this.hass.localize("ui.panel.profile.themes.backend-selected")} + + ${this.hass.localize("ui.panel.profile.themes.use_default")} - - ${this.hass.localize("ui.panel.profile.themes.default")} + + Home Assistant ${this._themeNames.map( (theme) => html` @@ -85,7 +85,8 @@ export class HaPickThemeRow extends LitElement { )} - ${curTheme === DEFAULT_THEME || this._supportsModeSelection(curTheme) + ${curTheme === HOME_ASSISTANT_THEME || + this._supportsModeSelection(curTheme) ? html`
- ${curTheme === DEFAULT_THEME + ${curTheme === HOME_ASSISTANT_THEME ? html`