finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix flash on dashboard (#30572)

Browse source 
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.
This commit is contained in:
silverwind 2024-04-21 22:24:56 +02:00 committed by Earl Warren
parent 2ec0c5e284
commit e64e8d24ac
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
templates/user/dashboard/dashboard.tmpl
View file

@ -1,8 +1,8 @@
{{template "base/head" .}} {{template "base/head" .}}
<div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds"> <div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds">
{{template "user/dashboard/navbar" .}} {{template "user/dashboard/navbar" .}}
<div class="ui container flex-container">
{{template "base/alert" .}} {{template "base/alert" .}}
<div class="ui container flex-container">
<div class="flex-container-main"> <div class="flex-container-main">
{{template "user/heatmap" .}} {{template "user/heatmap" .}}
{{template "user/dashboard/feeds" .}} {{template "user/dashboard/feeds" .}}

6
web_src/css/base.css
View file

@ -636,6 +636,12 @@ img.ui.avatar,
background: var(--color-active); 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 textarea,
.ui.form .fields.error .field select, .ui.form .fields.error .field select,
.ui.form .fields.error .field input:not([type]), .ui.form .fields.error .field input:not([type]),