From 3dc4b1d7759aba78278c002773e055a8877c5166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Fri, 7 Aug 2020 16:36:49 +0200 Subject: [PATCH 1/5] Merge to master for 20200807.1 (#6566) * Reorder to not break jinja templates (#6564) * Bumped version to 20200807.1 --- setup.py | 2 +- src/html/index.html.template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index f4c217e8bd..834ffe3aab 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20200807.0", + version="20200807.1", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors", diff --git a/src/html/index.html.template b/src/html/index.html.template index 0225c9b3ab..fe4271c0fb 100644 --- a/src/html/index.html.template +++ b/src/html/index.html.template @@ -47,12 +47,12 @@ background-color: var(--primary-background-color); } @media (prefers-color-scheme: dark) { - #ha-init-skeleton::before { - background-color: #1c1c1c; - } html { background-color: #111111; } + #ha-init-skeleton::before { + background-color: #1c1c1c; + } } From a31f53395ffa9d8e42fcad7bb5dcc5e04cb651f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 10 Aug 2020 16:23:14 +0200 Subject: [PATCH 2/5] Set min width (#6583) --- .../lovelace/editor/view-editor/hui-dialog-edit-view.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts index a03c42f826..cc5c9daaca 100644 --- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts +++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts @@ -411,6 +411,12 @@ export class HuiDialogEditView extends LitElement { margin: 12px 16px; flex-wrap: wrap; } + + @media all and (min-width: 600px) { + ha-dialog { + --mdc-dialog-min-width: 600px; + } + } `, ]; } From 15193fcf5f3e591ede3f6c7f8222a4b1669d8b69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Mon, 10 Aug 2020 16:42:55 +0200 Subject: [PATCH 3/5] Set header and tab color (#6582) --- src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts index cc5c9daaca..99a4022efc 100644 --- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts +++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts @@ -342,6 +342,7 @@ export class HuiDialogEditView extends LitElement { css` h2 { display: block; + color: var(--primary-text-color); line-height: normal; -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; @@ -380,6 +381,7 @@ export class HuiDialogEditView extends LitElement { } paper-tabs { --paper-tabs-selection-bar-color: var(--primary-color); + color: var(--primary-text-color); text-transform: uppercase; border-bottom: 1px solid rgba(0, 0, 0, 0.1); padding: 0 20px; From 71c592a0ce8de3bee3669e8a49d1bfbaf4a1a093 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20S=C3=B8rensen?= Date: Tue, 11 Aug 2020 13:22:46 +0200 Subject: [PATCH 4/5] Use primary-background-color when it exists (#6594) --- src/html/index.html.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/html/index.html.template b/src/html/index.html.template index fe4271c0fb..5ec5dd1dc1 100644 --- a/src/html/index.html.template +++ b/src/html/index.html.template @@ -48,7 +48,7 @@ } @media (prefers-color-scheme: dark) { html { - background-color: #111111; + background-color: var(--primary-background-color, #111111); } #ha-init-skeleton::before { background-color: #1c1c1c; From 3b3aeea224f5fc8cd5ce988b8091e9f41a9c4ea5 Mon Sep 17 00:00:00 2001 From: Ludeeus Date: Tue, 11 Aug 2020 11:57:03 +0000 Subject: [PATCH 5/5] Bumped version to 20200811.0 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 834ffe3aab..289a8db76f 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name="home-assistant-frontend", - version="20200807.1", + version="20200811.0", description="The Home Assistant frontend", url="https://github.com/home-assistant/home-assistant-polymer", author="The Home Assistant Authors",