Skip to content

Commit 7e160f8

Browse files
authored
Reduce margins on user settings page, introduce flex-container (#26046)
Same as #26026 but for the user settings page. It introduces a new `flex-container` class and shares it across both pages. Before and After: <img width="1264" alt="Screenshot 2023-07-21 at 19 35 57" src="https://github.com/go-gitea/gitea/assets/115237/1358dab4-55c0-40ce-a4d5-673099304f3d"> <img width="1269" alt="Screenshot 2023-07-21 at 19 35 42" src="https://github.com/go-gitea/gitea/assets/115237/34812f6d-dc65-4009-b977-90e03efdc6d1">
1 parent 1e76a82 commit 7e160f8

File tree

7 files changed

+30
-29
lines changed

7 files changed

+30
-29
lines changed

templates/admin/layout_head.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<div class="ui container">
44
{{template "base/alert" .ctxData}}
55
</div>
6-
<div class="ui container admin-container">
6+
<div class="ui container flex-container">
77
{{template "admin/navbar" .ctxData}}
8-
<div class="admin-main">
8+
<div class="flex-container-main">
99
{{/* block: admin-setting-content */}}
1010

1111
{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}

templates/admin/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="admin-nav">
1+
<div class="flex-container-nav">
22
<div class="ui fluid vertical menu">
33
<div class="header item">{{.locale.Tr "settings"}}</div>
44
<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">

templates/user/settings/layout_head.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{{template "base/head" .ctxData}}
22
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
3-
<div class="ui container stackable grid">
3+
<div class="ui container flex-container">
44
{{template "user/settings/navbar" .ctxData}}
5-
<div class="twelve wide column">
5+
<div class="flex-container-main">
66
{{template "base/alert" .ctxData}}
77
{{/* block: user-setting-content */}}
88

templates/user/settings/navbar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="four wide column">
1+
<div class="flex-container-nav">
22
<div class="ui fluid vertical menu">
33
<div class="header item">{{.locale.Tr "settings"}}</div>
44
<a class="{{if .PageIsSettingsProfile}}active {{end}}item" href="{{AppSubUrl}}/user/settings">

web_src/css/admin.css

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,3 @@
1-
.admin-container {
2-
margin-top: 15px;
3-
display: flex !important;
4-
gap: 16px;
5-
}
6-
7-
.admin-nav {
8-
width: 240px;
9-
}
10-
11-
.admin-main {
12-
flex: 1;
13-
}
14-
15-
@media (max-width: 767.98px) {
16-
.admin-container {
17-
flex-direction: column;
18-
}
19-
.admin-nav {
20-
width: auto;
21-
}
22-
}
23-
241
.admin.hooks .list > .item:not(:first-child) {
252
border-top: 1px solid var(--color-secondary);
263
padding: 0.25rem 1rem;

web_src/css/index.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@import "./modules/toast.css";
1212
@import "./modules/divider.css";
1313
@import "./modules/svg.css";
14+
@import "./modules/flexcontainer.css";
1415

1516
@import "./shared/issuelist.css";
1617
@import "./shared/milestone.css";

web_src/css/modules/flexcontainer.css

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* container for full-page content with sidebar on left */
2+
3+
.flex-container {
4+
display: flex !important;
5+
gap: 16px;
6+
}
7+
8+
.flex-container-nav {
9+
width: 240px;
10+
}
11+
12+
.flex-container-main {
13+
flex: 1;
14+
}
15+
16+
@media (max-width: 767.98px) {
17+
.flex-container {
18+
flex-direction: column;
19+
}
20+
.flex-container-nav {
21+
width: auto;
22+
}
23+
}

0 commit comments

Comments
 (0)