From cbc0b7307d8d5b6eda93bf0c9f26e20c102402f1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 4 Oct 2023 08:47:54 +0200 Subject: [PATCH] Use flex-container for repo and org settings (#27418) Same as https://github.com/go-gitea/gitea/pull/26046 but for repo and org settings pages, reducing the margins between the boxes: Screenshot 2023-10-03 at 23 25 19 Screenshot 2023-10-03 at 23 27 12 Co-authored-by: Giteabot --- templates/org/settings/layout_head.tmpl | 4 ++-- templates/org/settings/navbar.tmpl | 2 +- templates/repo/settings/layout_head.tmpl | 4 ++-- templates/repo/settings/navbar.tmpl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/org/settings/layout_head.tmpl b/templates/org/settings/layout_head.tmpl index c245a3bf62..31dad2c141 100644 --- a/templates/org/settings/layout_head.tmpl +++ b/templates/org/settings/layout_head.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .ctxData}}
{{template "org/header" .ctxData}} -
+
{{template "org/settings/navbar" .ctxData}} -
+
{{template "base/alert" .ctxData}} {{/* block: org-setting-content */}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 201ac3b9f2..64ae20f0a3 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -1,4 +1,4 @@ -
+
{{ctx.Locale.Tr "org.settings"}}
diff --git a/templates/repo/settings/layout_head.tmpl b/templates/repo/settings/layout_head.tmpl index 3117309831..efec9bf874 100644 --- a/templates/repo/settings/layout_head.tmpl +++ b/templates/repo/settings/layout_head.tmpl @@ -1,9 +1,9 @@ {{template "base/head" .ctxData}}
{{template "repo/header" .ctxData}} -
+
{{template "repo/settings/navbar" .ctxData}} -
+
{{template "base/alert" .ctxData}} {{/* block: repo-setting-content */}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 74c4b86c68..b16eb6076f 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -1,4 +1,4 @@ -
+
{{ctx.Locale.Tr "repo.settings"}}