Skip to content

Commit 12b2e4d

Browse files
committed
fix project view
1 parent f8afaad commit 12b2e4d

File tree

3 files changed

+17
-32
lines changed

3 files changed

+17
-32
lines changed

templates/projects/view.tmpl

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
{{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
22

33
<div class="ui container tw-max-w-full">
4-
<div class="tw-flex tw-justify-between tw-items-center tw-mb-4 tw-gap-3">
5-
<h2 class="tw-mb-0 tw-flex-1 tw-break-anywhere">{{.Project.Title}}</h2>
6-
<div class="project-toolbar-right">
7-
<div class="ui secondary filter menu labels">
8-
{{$queryLink := QueryBuild "?" "labels" .SelectLabels "assignee" $.AssigneeID "archived_labels" (Iif $.ShowArchivedLabels "true")}}
9-
10-
{{template "repo/issue/filter_item_label" dict "Labels" .Labels "QueryLink" $queryLink "SupportArchivedLabel" true}}
11-
12-
{{template "repo/issue/filter_item_user_assign" dict
13-
"QueryParamKey" "assignee"
14-
"QueryLink" $queryLink
15-
"UserSearchList" $.Assignees
16-
"SelectedUserId" $.AssigneeID
17-
"TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee")
18-
"TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee")
19-
"TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee")
20-
}}
21-
</div>
22-
</div>
4+
<div class="flex-text-block tw-flex-wrap tw-mb-4">
5+
<h2 class="tw-mb-0">{{.Project.Title}}</h2>
6+
<div class="tw-flex-1"></div>
7+
<div class="ui secondary menu tw-m-0">
8+
{{$queryLink := QueryBuild "?" "labels" .SelectLabels "assignee" $.AssigneeID "archived_labels" (Iif $.ShowArchivedLabels "true")}}
9+
{{template "repo/issue/filter_item_label" dict "Labels" .Labels "QueryLink" $queryLink "SupportArchivedLabel" true}}
10+
{{template "repo/issue/filter_item_user_assign" dict
11+
"QueryParamKey" "assignee"
12+
"QueryLink" $queryLink
13+
"UserSearchList" $.Assignees
14+
"SelectedUserId" $.AssigneeID
15+
"TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee")
16+
"TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee")
17+
"TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee")
18+
}}
19+
</div>
2320
{{if $canWriteProject}}
2421
<div class="ui compact mini menu">
2522
<a class="item" href="{{.Link}}/edit?redirect=project">

templates/repo/projects/view.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div role="main" aria-label="{{.Title}}" class="page-content repository projects view-project">
33
{{template "repo/header" .}}
44
<div class="ui container padded">
5-
<div class="tw-flex tw-justify-end tw-items-center tw-mb-4 flex-text-block">
5+
<div class="flex-text-block tw-justify-end tw-mb-4">
66
<a class="ui small button" href="{{.RepoLink}}/labels">{{ctx.Locale.Tr "repo.labels"}}</a>
77
<a class="ui small button" href="{{.RepoLink}}/milestones">{{ctx.Locale.Tr "repo.milestones"}}</a>
88
<a class="ui small primary button" href="{{.RepoLink}}/issues/new/choose?project={{.Project.ID}}">{{ctx.Locale.Tr "repo.issues.new"}}</a>

web_src/css/features/projects.css

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@
88
margin: 0 0.5em;
99
}
1010

11-
.project-toolbar-right .filter.menu {
12-
flex-direction: row;
13-
flex-wrap: wrap;
14-
}
15-
16-
@media (max-width: 767.98px) {
17-
.project-toolbar-right .dropdown .menu {
18-
left: auto !important;
19-
right: auto !important;
20-
}
21-
}
22-
2311
.project-column {
2412
background-color: var(--color-project-column-bg) !important;
2513
border: 1px solid var(--color-secondary) !important;

0 commit comments

Comments
 (0)