From bd58fe8cae7a865d2ffe0255256a4b61afaa838f Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 11 Mar 2020 19:12:17 +0100 Subject: [PATCH 1/2] Fix area dialog to wide --- src/panels/config/areas/dialog-area-registry-detail.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts index 093f0997664f..8a5f0f3ffc1a 100644 --- a/src/panels/config/areas/dialog-area-registry-detail.ts +++ b/src/panels/config/areas/dialog-area-registry-detail.ts @@ -142,8 +142,10 @@ class DialogAreaDetail extends LitElement { return [ haStyleDialog, css` - ha-paper-dialog { - min-width: 400px; + @media all and (min-width: 450px) { + ha-paper-dialog { + min-width: 400px; + } } .form { padding-bottom: 24px; From cbbdc2b887a8d418870b77049ecca461836cdadb Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 11 Mar 2020 20:20:56 +0100 Subject: [PATCH 2/2] Update styles --- .../areas/dialog-area-registry-detail.ts | 5 ----- .../entities/entity-registry-settings.ts | 7 ------ src/resources/styles.ts | 22 +++++++++++++++++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts index 8a5f0f3ffc1a..af7410c8c5ed 100644 --- a/src/panels/config/areas/dialog-area-registry-detail.ts +++ b/src/panels/config/areas/dialog-area-registry-detail.ts @@ -142,11 +142,6 @@ class DialogAreaDetail extends LitElement { return [ haStyleDialog, css` - @media all and (min-width: 450px) { - ha-paper-dialog { - min-width: 400px; - } - } .form { padding-bottom: 24px; } diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts index 757d0d619713..d26b1461fc7f 100644 --- a/src/panels/config/entities/entity-registry-settings.ts +++ b/src/panels/config/entities/entity-registry-settings.ts @@ -241,18 +241,11 @@ export class EntityRegistrySettings extends LitElement { } mwc-button.warning { margin-right: auto; - --mdc-theme-primary: var(--google-red-500); - } - .error { - color: var(--google-red-500); } .row { margin-top: 8px; color: var(--primary-text-color); } - .secondary { - color: var(--secondary-text-color); - } `, ]; } diff --git a/src/resources/styles.ts b/src/resources/styles.ts index 972e73453887..00d4f05b8f30 100644 --- a/src/resources/styles.ts +++ b/src/resources/styles.ts @@ -76,6 +76,22 @@ export const haStyle = css` @apply --paper-font-title; } + .secondary { + color: var(--secondary-text-color); + } + + .error { + color: var(--google-red-500); + } + + .warning { + color: var(--google-red-500); + } + + mwc-button.warning { + --mdc-theme-primary: var(--google-red-500); + } + button.link { background: none; color: inherit; @@ -160,8 +176,10 @@ export const haStyleDialog = css` padding: 8px; } - .paper-dialog-buttons .warning { - --mdc-theme-primary: var(--google-red-500); + @media all and (min-width: 450px) { + ha-paper-dialog { + min-width: 400px; + } } @media all and (max-width: 450px), all and (max-height: 500px) {