Skip to content

Use flex-container for repo and org settings #27418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 4, 2023
Merged

Use flex-container for repo and org settings #27418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8429a1
Use flex-container for repo and org settings
silverwind Oct 3, 2023
12c706d
Merge branch 'main' into repoorgflex
GiteaBot Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/org/settings/layout_head.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 */}}

Expand Down
2 changes: 1 addition & 1 deletion templates/org/settings/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/settings/layout_head.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 */}}

Expand Down
2 changes: 1 addition & 1 deletion templates/repo/settings/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down