From e64e8d24ace06910aab574eb073b429f3717cc0a Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 21 Apr 2024 22:24:56 +0200
Subject: [PATCH] Fix flash on dashboard (#30572)

Fixes https://github.com/go-gitea/gitea/issues/30566, regression from
https://github.com/go-gitea/gitea/pull/30214.

(cherry picked from commit 1b1b8500aea0a17e999093e65b573ce54ae080ae)

Conflicts:
	web_src/css/base.css
	the conflict is because
	https://codeberg.org/forgejo/forgejo/pulls/3350
	skipped Remove fomantic menu module (gitea#30325)
	and it was not ported.
---
 templates/user/dashboard/dashboard.tmpl | 2 +-
 web_src/css/base.css                    | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 030fd49940..415423d436 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 c571280ee0..ce0b0f569a 100644
--- a/web_src/css/base.css
+++ b/web_src/css/base.css
@@ -636,6 +636,12 @@ img.ui.avatar,
   background: var(--color-active);
 }
 
+/* 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);
+}
+
 .ui.form .fields.error .field textarea,
 .ui.form .fields.error .field select,
 .ui.form .fields.error .field input:not([type]),