From 59daa91b500b647243110e9c4a50c017b986d638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Wed, 27 Jan 2021 14:17:46 +0100 Subject: [PATCH 1/3] Markdown format blueprint descriptions in import dialog --- .../blueprint/dialog-import-blueprint.ts | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/panels/config/blueprint/dialog-import-blueprint.ts b/src/panels/config/blueprint/dialog-import-blueprint.ts index c236c333c95a..5aab4736d8ba 100644 --- a/src/panels/config/blueprint/dialog-import-blueprint.ts +++ b/src/panels/config/blueprint/dialog-import-blueprint.ts @@ -1,3 +1,4 @@ +import "../../../components/ha-markdown"; import "@material/mwc-button"; import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable"; import "@polymer/paper-input/paper-input"; @@ -74,9 +75,10 @@ class DialogImportBlueprint extends LitElement { this._result.blueprint.metadata.domain )}
-

- ${this._result.blueprint.metadata.description} -

+ ${this._result.validation_errors ? html`

@@ -210,17 +212,6 @@ class DialogImportBlueprint extends LitElement { this._saving = false; } } - - static get styles(): CSSResult[] { - return [ - haStyleDialog, - css` - .pre-line { - white-space: pre-line; - } - `, - ]; - } } declare global { From fcad0ca4caed92ed767881934c1f5e0c129d1dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Wed, 27 Jan 2021 15:06:40 +0100 Subject: [PATCH 2/3] Restore styles --- src/panels/config/blueprint/dialog-import-blueprint.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/panels/config/blueprint/dialog-import-blueprint.ts b/src/panels/config/blueprint/dialog-import-blueprint.ts index 5aab4736d8ba..fd92342d125e 100644 --- a/src/panels/config/blueprint/dialog-import-blueprint.ts +++ b/src/panels/config/blueprint/dialog-import-blueprint.ts @@ -4,7 +4,6 @@ import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable"; import "@polymer/paper-input/paper-input"; import type { PaperInputElement } from "@polymer/paper-input/paper-input"; import { - css, CSSResult, customElement, html, @@ -212,6 +211,10 @@ class DialogImportBlueprint extends LitElement { this._saving = false; } } + + static get styles(): CSSResult[] { + return [haStyleDialog]; + } } declare global { From 3bb97e365300f579bed5937d125466075b8d26a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Wed, 27 Jan 2021 15:18:19 +0100 Subject: [PATCH 3/3] Incorporate review suggestions --- src/panels/config/blueprint/dialog-import-blueprint.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/config/blueprint/dialog-import-blueprint.ts b/src/panels/config/blueprint/dialog-import-blueprint.ts index fd92342d125e..4761091b63fc 100644 --- a/src/panels/config/blueprint/dialog-import-blueprint.ts +++ b/src/panels/config/blueprint/dialog-import-blueprint.ts @@ -212,8 +212,8 @@ class DialogImportBlueprint extends LitElement { } } - static get styles(): CSSResult[] { - return [haStyleDialog]; + static get styles(): CSSResult { + return haStyleDialog; } }