femsci/forgejo
femsci/forgejo
1
0
Fork 0
forked from NYANDEV/forgejo
Code Pull requests Activity

Use flex-container for repo and org settings (#27418) (#27430)

Browse source 
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>
This commit is contained in:
Giteabot 2023-10-04 15:20:43 +08:00 committed by GitHub
parent 290440e1ee
commit 1dd84ec3a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/org/settings/layout_head.tmpl
View file

@ -1,9 +1,9 @@
{{template "base/head" .ctxData}} {{template "base/head" .ctxData}}
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
{{template "org/header" .ctxData}} {{template "org/header" .ctxData}}
<div class="ui container stackable grid"> <div class="ui container flex-container">
{{template "org/settings/navbar" .ctxData}} {{template "org/settings/navbar" .ctxData}}
<div class="twelve wide column"> <div class="flex-container-main">
{{template "base/alert" .ctxData}} {{template "base/alert" .ctxData}}
{{/* block: org-setting-content */}} {{/* block: org-setting-content */}}

2
templates/org/settings/navbar.tmpl
View file

@ -1,4 +1,4 @@
<div class="four wide column"> <div class="flex-container-nav">
<div class="ui fluid vertical menu"> <div class="ui fluid vertical menu">
<div class="header item">{{ctx.Locale.Tr "org.settings"}}</div> <div class="header item">{{ctx.Locale.Tr "org.settings"}}</div>
<a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.OrgLink}}/settings"> <a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.OrgLink}}/settings">

4
templates/repo/settings/layout_head.tmpl
View file

@ -1,9 +1,9 @@
{{template "base/head" .ctxData}} {{template "base/head" .ctxData}}
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}"> <div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
{{template "repo/header" .ctxData}} {{template "repo/header" .ctxData}}
<div class="ui container stackable grid"> <div class="ui container flex-container">
{{template "repo/settings/navbar" .ctxData}} {{template "repo/settings/navbar" .ctxData}}
<div class="twelve wide column"> <div class="flex-container-main">
{{template "base/alert" .ctxData}} {{template "base/alert" .ctxData}}
{{/* block: repo-setting-content */}} {{/* block: repo-setting-content */}}

2
templates/repo/settings/navbar.tmpl
View file

@ -1,4 +1,4 @@
<div class="four wide column"> <div class="flex-container-nav">
<div class="ui fluid vertical menu"> <div class="ui fluid vertical menu">
<div class="header item">{{ctx.Locale.Tr "repo.settings"}}</div> <div class="header item">{{ctx.Locale.Tr "repo.settings"}}</div>
<a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.RepoLink}}/settings"> <a class="{{if .PageIsSettingsOptions}}active {{end}}item" href="{{.RepoLink}}/settings">