From 83c2978c8fe03068ab35339928a7a9d43fd5c0a0 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 18 Apr 2024 19:43:31 +0200
Subject: [PATCH 1/5] Fix flash on dashboard

---
 templates/user/dashboard/dashboard.tmpl | 2 +-
 web_src/css/base.css                    | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 030fd4994065..415423d43616 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -1,8 +1,8 @@
 {{template "base/head" .}}
 <div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds">
 	{{template "user/dashboard/navbar" .}}
+	{{template "base/alert" .}}
 	<div class="ui container flex-container">
-		{{template "base/alert" .}}
 		<div class="flex-container-main">
 			{{template "user/heatmap" .}}
 			{{template "user/dashboard/feeds" .}}
diff --git a/web_src/css/base.css b/web_src/css/base.css
index 7e781aa97b78..ae4cab5ae782 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -494,6 +494,10 @@ img.ui.avatar,
   margin-top: calc(var(--page-spacing) - 1rem);
 }
 
+.page-content > .flash-message {
+  margin: 0 var(--page-margin-x);
+}
+
 .ui.form .fields.error .field textarea,
 .ui.form .fields.error .field select,
 .ui.form .fields.error .field input:not([type]),

From 68c2d0e883e53c471243abadb66520eabe835701 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 18 Apr 2024 19:47:01 +0200
Subject: [PATCH 2/5] comment

---
 web_src/css/base.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index ae4cab5ae782..1cf4fe2308f9 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -494,6 +494,7 @@ img.ui.avatar,
   margin-top: calc(var(--page-spacing) - 1rem);
 }
 
+/* add horizontal margin to elements that are outside of any container */
 .page-content > .flash-message {
   margin: 0 var(--page-margin-x);
 }

From 0d245c8eb153d988ac8e01011d801878e59e1e48 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 18 Apr 2024 22:06:09 +0200
Subject: [PATCH 3/5] Update web_src/css/base.css

---
 web_src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 1cf4fe2308f9..6b7a1c1b59fc 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -494,7 +494,7 @@ img.ui.avatar,
   margin-top: calc(var(--page-spacing) - 1rem);
 }
 
-/* add horizontal margin to elements that are outside of any container */
+/* add horizontal margin to elements that are outside of .flex-container or .ui.container */
 .page-content > .flash-message {
   margin: 0 var(--page-margin-x);
 }

From a4accfb59f6f62c83d91cf9b1bf06ecd85d437fc Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 18 Apr 2024 22:06:40 +0200
Subject: [PATCH 4/5] Update web_src/css/base.css

---
 web_src/css/base.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 6b7a1c1b59fc..39382e48654a 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -496,7 +496,8 @@ img.ui.avatar,
 
 /* add horizontal margin to elements that are outside of .flex-container or .ui.container */
 .page-content > .flash-message {
-  margin: 0 var(--page-margin-x);
+  margin-left: var(--page-margin-x);
+  margin-right: var(--page-margin-x);
 }
 
 .ui.form .fields.error .field textarea,

From aef95c4378c3524376db3d6725a17cfffdd5ca75 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Thu, 18 Apr 2024 22:58:50 +0200
Subject: [PATCH 5/5] Update web_src/css/base.css

---
 web_src/css/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/css/base.css b/web_src/css/base.css
index 39382e48654a..001a0ff0320d 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -494,7 +494,7 @@ img.ui.avatar,
   margin-top: calc(var(--page-spacing) - 1rem);
 }
 
-/* add horizontal margin to elements that are outside of .flex-container or .ui.container */
+/* add horizontal margin to elements that are outside top-level of .flex-container or .ui.container */
 .page-content > .flash-message {
   margin-left: var(--page-margin-x);
   margin-right: var(--page-margin-x);