diff options
| author | Giteabot <teabot@gitea.io> | 2023-10-04 15:20:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-04 07:20:43 +0000 |
| commit | 1dd84ec3a16066698cca4256ad686e0386621ee2 (patch) | |
| tree | 2c35341afa1d8daadb279a606037185576ecce22 | |
| parent | 290440e1eedc732ac9ea0162fe8f535f8f8ae492 (diff) | |
| download | gitea-1dd84ec3a16066698cca4256ad686e0386621ee2.tar.gz gitea-1dd84ec3a16066698cca4256ad686e0386621ee2.zip | |
Use flex-container for repo and org settings (#27418) (#27430)
Backport #27418 by @silverwind
Same as https://github.com/go-gitea/gitea/pull/26046 but for repo and
org settings pages, reducing the margins between the boxes:
<img width="1247" alt="Screenshot 2023-10-03 at 23 25 19"
src="https://github.com/go-gitea/gitea/assets/115237/4e68ad5e-5fdc-4466-aefb-ec71bf411d45">
<img width="1255" alt="Screenshot 2023-10-03 at 23 27 12"
src="https://github.com/go-gitea/gitea/assets/115237/9068369b-a75d-401e-8b8d-3bd4bbe097dc">
Co-authored-by: silverwind <me@silverwind.io>
| -rw-r--r-- | templates/org/settings/layout_head.tmpl | 4 | ||||
| -rw-r--r-- | templates/org/settings/navbar.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/settings/layout_head.tmpl | 4 | ||||
| -rw-r--r-- | 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}} <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> {{template "org/header" .ctxData}} - <div class="ui container stackable grid"> + <div class="ui container flex-container"> {{template "org/settings/navbar" .ctxData}} - <div class="twelve wide column"> + <div class="flex-container-main"> {{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 @@ -<div class="four wide column"> +<div class="flex-container-nav"> <div class="ui fluid vertical menu"> <div class="header item">{{ctx.Locale.Tr "org.settings"}}</div> <a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.OrgLink}}/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}} <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> {{template "repo/header" .ctxData}} - <div class="ui container stackable grid"> + <div class="ui container flex-container"> {{template "repo/settings/navbar" .ctxData}} - <div class="twelve wide column"> + <div class="flex-container-main"> {{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 @@ -<div class="four wide column"> +<div class="flex-container-nav"> <div class="ui fluid vertical menu"> <div class="header item">{{ctx.Locale.Tr "repo.settings"}}</div> <a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.RepoLink}}/settings"> |