Skip to content

Commit

Permalink
Fix flash on dashboard (#30572)
Browse files Browse the repository at this point in the history
Fixes go-gitea/gitea#30566, regression from
go-gitea/gitea#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.
  • Loading branch information
silverwind authored and earl-warren committed Apr 28, 2024
1 parent 2ec0c5e commit e64e8d2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion templates/user/dashboard/dashboard.tmpl
Original file line number Diff line number Diff line change
@@ -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" .}}
Expand Down
6 changes: 6 additions & 0 deletions web_src/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -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]),
Expand Down

0 comments on commit e64e8d2

Please sign in to comment.