From be4dcbe40574c005b26f330e4cb6d3146144081e Mon Sep 17 00:00:00 2001
From: Bram Kragten <mail@bramkragten.nl>
Date: Wed, 31 Aug 2022 13:55:26 +0200
Subject: [PATCH] Fix dialog placement and overflow (#13527)

---
 src/components/ha-dialog.ts                            | 1 +
 src/dialogs/more-info/ha-more-info-dialog.ts           | 4 ++--
 src/panels/config/entities/entity-registry-settings.ts | 7 ++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/ha-dialog.ts b/src/components/ha-dialog.ts
index 8f28e4cf7d..b5b27e911f 100644
--- a/src/components/ha-dialog.ts
+++ b/src/components/ha-dialog.ts
@@ -80,6 +80,7 @@ export class HaDialog extends DialogBase {
       .mdc-dialog .mdc-dialog__surface {
         position: var(--dialog-surface-position, relative);
         top: var(--dialog-surface-top);
+        margin-top: var(--dialog-surface-margin-top);
         min-height: var(--mdc-dialog-min-height, auto);
         border-radius: var(--ha-dialog-border-radius, 28px);
       }
diff --git a/src/dialogs/more-info/ha-more-info-dialog.ts b/src/dialogs/more-info/ha-more-info-dialog.ts
index 6bbf6bee94..f07a3c3863 100644
--- a/src/dialogs/more-info/ha-more-info-dialog.ts
+++ b/src/dialogs/more-info/ha-more-info-dialog.ts
@@ -269,6 +269,7 @@ export class MoreInfoDialog extends LitElement {
         ha-dialog {
           --dialog-surface-position: static;
           --dialog-content-position: static;
+          --vertial-align-dialog: flex-start;
         }
 
         ha-header-bar {
@@ -301,8 +302,7 @@ export class MoreInfoDialog extends LitElement {
           ha-dialog {
             --mdc-dialog-min-width: 560px;
             --mdc-dialog-max-width: 560px;
-            --dialog-surface-position: fixed;
-            --dialog-surface-top: 40px;
+            --dialog-surface-margin-top: 40px;
             --mdc-dialog-max-height: calc(100% - 72px);
           }
 
diff --git a/src/panels/config/entities/entity-registry-settings.ts b/src/panels/config/entities/entity-registry-settings.ts
index f0d8a7eca9..b82acf3963 100644
--- a/src/panels/config/entities/entity-registry-settings.ts
+++ b/src/panels/config/entities/entity-registry-settings.ts
@@ -1044,7 +1044,6 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
       css`
         :host {
           display: block;
-          margin-bottom: 60px;
         }
         .container {
           padding: 20px 24px;
@@ -1056,11 +1055,9 @@ export class EntityRegistrySettings extends SubscribeMixin(LitElement) {
           justify-content: space-between;
           padding-bottom: max(env(safe-area-inset-bottom), 24px);
           background-color: var(--mdc-theme-surface, #fff);
-
-          position: absolute;
-          bottom: 0;
-          width: 100%;
           border-top: 1px solid var(--divider-color);
+          position: sticky;
+          bottom: 0px;
         }
         ha-select {
           width: 100%;