oppi.li / perf-test
loading up the forgejo repo on tangled to test page performance
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Fix flash message for flex-container (#30657)

(cherry picked from commit dd2aaadce3ecd3134a1ba0c82c5aaa05d6c11b2b)

Conflicts:
templates/admin/layout_head.tmpl
mostly already done by https://codeberg.org/forgejo/forgejo/pulls/3087
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.

authored by

wxiaoguang and committed by
Earl Warren a72b660c 50917ead

+2 -8
+1 -1
templates/admin/layout_head.tmpl
··· 1 1 {{template "base/head" .ctxData}} 2 2 <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> 3 - <div class="ui container flex-container"> 3 + <div class="ui container fluid padded flex-container"> 4 4 {{template "admin/navbar" .ctxData}} 5 5 <div class="flex-container-main"> 6 6 {{template "base/alert" .ctxData}}
+1 -1
templates/user/dashboard/dashboard.tmpl
··· 1 1 {{template "base/head" .}} 2 2 <div role="main" aria-label="{{.Title}}" class="page-content dashboard feeds"> 3 3 {{template "user/dashboard/navbar" .}} 4 - {{template "base/alert" .}} 5 4 <div class="ui container flex-container"> 6 5 <div class="flex-container-main"> 6 + {{template "base/alert" .}} 7 7 {{template "user/heatmap" .}} 8 8 {{template "user/dashboard/feeds" .}} 9 9 </div>
-6
web_src/css/base.css
··· 636 636 background: var(--color-active); 637 637 } 638 638 639 - /* add horizontal margin to elements that are outside top-level of .flex-container or .ui.container */ 640 - .page-content > .flash-message { 641 - margin-left: var(--page-margin-x); 642 - margin-right: var(--page-margin-x); 643 - } 644 - 645 639 .ui.form .fields.error .field textarea, 646 640 .ui.form .fields.error .field select, 647 641 .ui.form .fields.error .field input:not([type]),