Skip to content
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

Reduce margins on user settings page, introduce flex-container #26046

Merged
merged 8 commits into from
Jul 31, 2023
Merged

Reduce margins on user settings page, introduce flex-container #26046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3965c69
Reduce margins on user profile page
silverwind Jul 21, 2023
25f6156
Merge branch 'main' into uprof
silverwind Jul 25, 2023
6196e19
Merge remote-tracking branch 'origin/main' into uprof
silverwind Jul 30, 2023
7d776a7
Merge branch 'main' into uprof
GiteaBot Jul 30, 2023
02ceea5
Merge branch 'main' into uprof
GiteaBot Jul 31, 2023
5d18b00
Merge branch 'main' into uprof
GiteaBot Jul 31, 2023
9cd474e
Merge branch 'main' into uprof
GiteaBot Jul 31, 2023
e7947f1
Merge branch 'main' into uprof
GiteaBot Jul 31, 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/admin/layout_head.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<div class="ui container">
{{template "base/alert" .ctxData}}
</div>
<div class="ui container admin-container">
<div class="ui container flex-container">
{{template "admin/navbar" .ctxData}}
<div class="admin-main">
<div class="flex-container-main">
{{/* block: admin-setting-content */}}

{{if false}}{{/* to make html structure "likely" complete to prevent IDE warnings */}}
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/navbar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="admin-nav">
<div class="flex-container-nav">
<div class="ui fluid vertical menu">
<div class="header item">{{.locale.Tr "settings"}}</div>
<a class="{{if .PageIsAdminDashboard}}active {{end}}item" href="{{AppSubUrl}}/admin">
Expand Down
4 changes: 2 additions & 2 deletions templates/user/settings/layout_head.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{{template "base/head" .ctxData}}
<div role="main" aria-label="{{.ctxData.Title}}" class="page-content {{.pageClass}}">
<div class="ui container stackable grid">
<div class="ui container flex-container">
{{template "user/settings/navbar" .ctxData}}
<div class="twelve wide column">
<div class="flex-container-main">
{{template "base/alert" .ctxData}}
{{/* block: user-setting-content */}}

Expand Down
2 changes: 1 addition & 1 deletion templates/user/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">{{.locale.Tr "settings"}}</div>
<a class="{{if .PageIsSettingsProfile}}active {{end}}item" href="{{AppSubUrl}}/user/settings">
Expand Down
23 changes: 0 additions & 23 deletions web_src/css/admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
.admin-container {
margin-top: 15px;
display: flex !important;
gap: 16px;
}

.admin-nav {
width: 240px;
}

.admin-main {
flex: 1;
}

@media (max-width: 767.98px) {
.admin-container {
flex-direction: column;
}
.admin-nav {
width: auto;
}
}

.admin.hooks .list > .item:not(:first-child) {
border-top: 1px solid var(--color-secondary);
padding: 0.25rem 1rem;
Expand Down
1 change: 1 addition & 0 deletions web_src/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
@import "./modules/toast.css";
@import "./modules/divider.css";
@import "./modules/svg.css";
@import "./modules/flexcontainer.css";

@import "./shared/issuelist.css";
@import "./shared/milestone.css";
Expand Down
23 changes: 23 additions & 0 deletions web_src/css/modules/flexcontainer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
/* container for full-page content with sidebar on left */

.flex-container {
display: flex !important;
gap: 16px;
}

.flex-container-nav {
width: 240px;
}

.flex-container-main {
flex: 1;
}

@media (max-width: 767.98px) {
.flex-container {
flex-direction: column;
}
.flex-container-nav {
width: auto;
}
}