From 3099b685e0c615eeaba271cf3f21ff8e462fd703 Mon Sep 17 00:00:00 2001
From: Thomas von Deyen <thomas@vondeyen.com>
Date: Sun, 4 Aug 2024 18:49:48 +0200
Subject: [PATCH] Fix margin of alchemy-message in alchemy-dialog

(cherry picked from commit 9a30e737e5e24d79ad9f3963766d7d1d5703f340)

# Conflicts:
#	app/assets/builds/alchemy/admin.css
#	app/assets/builds/alchemy/admin.css.map
#	app/assets/stylesheets/alchemy/dialogs.scss
---
 app/assets/stylesheets/alchemy/dialogs.scss | 12 ++++++++----
 app/assets/stylesheets/alchemy/errors.scss  |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/alchemy/dialogs.scss b/app/assets/stylesheets/alchemy/dialogs.scss
index a8b4c7aea9..331e75d979 100644
--- a/app/assets/stylesheets/alchemy/dialogs.scss
+++ b/app/assets/stylesheets/alchemy/dialogs.scss
@@ -82,13 +82,15 @@ $dialog-transition-duration: 150ms;
     }
 
     form,
-    .info.message {
+    .info.message,
+    alchemy-message[type="info"] {
       position: absolute;
       right: 2 * $default-padding;
       width: 256px;
     }
 
-    .info.message {
+    .info.message,
+    alchemy-message[type="info"] {
       top: 2 * $default-padding;
       margin: 0 0 0 8px;
       padding: 0 8px 0 32px;
@@ -158,14 +160,16 @@ $dialog-transition-duration: 150ms;
   position: relative;
   color: $text-color;
 
-  .message {
+  .message,
+  alchemy-message {
     margin: 8px;
   }
 
   &.padded {
     padding: 4 * $default-padding;
 
-    .message {
+    .message,
+    alchemy-message {
       margin: 0 0 8px 0;
     }
   }
diff --git a/app/assets/stylesheets/alchemy/errors.scss b/app/assets/stylesheets/alchemy/errors.scss
index 1a60c25dd6..f8d407a7ed 100644
--- a/app/assets/stylesheets/alchemy/errors.scss
+++ b/app/assets/stylesheets/alchemy/errors.scss
@@ -43,4 +43,8 @@ body.error {
     max-height: 100%;
     overflow-y: scroll;
   }
+
+  alchemy-message[type="error"] {
+    margin: 0;
+  }
 }