From deca0f9d016ee6bedfec5c077aff690c4316a14b Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Fri, 21 Feb 2025 00:57:38 +0000 Subject: [PATCH 1/4] Adjust the layout of the top toolbar on the issues page --- templates/repo/issue/list.tmpl | 3 ++- web_src/css/repo/list-header.css | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 53d0eca171fee..88733732ffd98 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -15,8 +15,9 @@ {{end}}
- {{template "repo/issue/navbar" .}} {{template "repo/issue/search" .}} + {{ctx.Locale.Tr "repo.labels"}} + {{ctx.Locale.Tr "repo.milestones"}} {{if not .Repository.IsArchived}} {{if .PageIsIssueList}} {{ctx.Locale.Tr "repo.issues.new"}} diff --git a/web_src/css/repo/list-header.css b/web_src/css/repo/list-header.css index e666e046d3275..19845be7accea 100644 --- a/web_src/css/repo/list-header.css +++ b/web_src/css/repo/list-header.css @@ -5,6 +5,10 @@ gap: .5rem; } +.list-header > .ui.button { + margin: 0; +} + .list-header-search { display: flex; flex: 1; From ea9ebbb88f4dae47afd93f8fc1d26a761b1e8d73 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 28 Mar 2025 15:08:52 +0800 Subject: [PATCH 2/4] fix margin --- templates/repo/issue/list.tmpl | 2 +- web_src/css/base.css | 5 +++++ web_src/css/repo/list-header.css | 4 ---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 88733732ffd98..0ab761e038518 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -14,7 +14,7 @@
{{end}} -
+
{{template "repo/issue/search" .}} {{ctx.Locale.Tr "repo.labels"}} {{ctx.Locale.Tr "repo.milestones"}} diff --git a/web_src/css/base.css b/web_src/css/base.css index 47b4f44a66f58..b3ad02696acc3 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1155,6 +1155,11 @@ table th[data-sortt-desc] .svg { min-width: 0; } +.flex-text-block > .ui.button, +.flex-text-inline > .ui.button { + margin: 0; /* fomantic buttons have default margin, when we use them in a flex container with gap, we do not need these margins */ +} + /* to override Fomantic's default display: block for ".menu .item", and use a slightly larger gap for menu item content the "!important" is necessary to override Fomantic UI menu item styles, meanwhile we should keep the "hidden" items still hidden */ .ui.dropdown .menu.flex-items-menu > .item:not(.hidden, .filtered, .tw-hidden) { diff --git a/web_src/css/repo/list-header.css b/web_src/css/repo/list-header.css index 19845be7accea..e666e046d3275 100644 --- a/web_src/css/repo/list-header.css +++ b/web_src/css/repo/list-header.css @@ -5,10 +5,6 @@ gap: .5rem; } -.list-header > .ui.button { - margin: 0; -} - .list-header-search { display: flex; flex: 1; From f8afaadcf489777a451d5d19dce001666f3e5012 Mon Sep 17 00:00:00 2001 From: Kerwin Bryant Date: Fri, 28 Mar 2025 07:15:13 +0000 Subject: [PATCH 3/4] fix --- templates/repo/projects/view.tmpl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 05ad7264bf8fa..1b0d92df89f7c 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -2,8 +2,9 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} +
+ {{ctx.Locale.Tr "repo.labels"}} + {{ctx.Locale.Tr "repo.milestones"}} {{ctx.Locale.Tr "repo.issues.new"}}
From 12b2e4d9d6662ab2577d25988dc15bd959abe78f Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 28 Mar 2025 15:29:36 +0800 Subject: [PATCH 4/4] fix project view --- templates/projects/view.tmpl | 35 ++++++++++++++----------------- templates/repo/projects/view.tmpl | 2 +- web_src/css/features/projects.css | 12 ----------- 3 files changed, 17 insertions(+), 32 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index f4478d544a70a..79925e69cc687 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -1,25 +1,22 @@ {{$canWriteProject := and .CanWriteProjects (or (not .Repository) (not .Repository.IsArchived))}}
-
-

{{.Project.Title}}

-
-
- {{$queryLink := QueryBuild "?" "labels" .SelectLabels "assignee" $.AssigneeID "archived_labels" (Iif $.ShowArchivedLabels "true")}} - - {{template "repo/issue/filter_item_label" dict "Labels" .Labels "QueryLink" $queryLink "SupportArchivedLabel" true}} - - {{template "repo/issue/filter_item_user_assign" dict - "QueryParamKey" "assignee" - "QueryLink" $queryLink - "UserSearchList" $.Assignees - "SelectedUserId" $.AssigneeID - "TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee") - "TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") - "TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") - }} -
-
+
+

{{.Project.Title}}

+
+
+ {{$queryLink := QueryBuild "?" "labels" .SelectLabels "assignee" $.AssigneeID "archived_labels" (Iif $.ShowArchivedLabels "true")}} + {{template "repo/issue/filter_item_label" dict "Labels" .Labels "QueryLink" $queryLink "SupportArchivedLabel" true}} + {{template "repo/issue/filter_item_user_assign" dict + "QueryParamKey" "assignee" + "QueryLink" $queryLink + "UserSearchList" $.Assignees + "SelectedUserId" $.AssigneeID + "TextFilterTitle" (ctx.Locale.Tr "repo.issues.filter_assignee") + "TextFilterMatchNone" (ctx.Locale.Tr "repo.issues.filter_assginee_no_assignee") + "TextFilterMatchAny" (ctx.Locale.Tr "repo.issues.filter_assignee_any_assignee") + }} +
{{if $canWriteProject}}
diff --git a/templates/repo/projects/view.tmpl b/templates/repo/projects/view.tmpl index 1b0d92df89f7c..7267a99b1db0f 100644 --- a/templates/repo/projects/view.tmpl +++ b/templates/repo/projects/view.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}}
-
+
{{ctx.Locale.Tr "repo.labels"}} {{ctx.Locale.Tr "repo.milestones"}} {{ctx.Locale.Tr "repo.issues.new"}} diff --git a/web_src/css/features/projects.css b/web_src/css/features/projects.css index 8763d3684eb42..72ef523913e34 100644 --- a/web_src/css/features/projects.css +++ b/web_src/css/features/projects.css @@ -8,18 +8,6 @@ margin: 0 0.5em; } -.project-toolbar-right .filter.menu { - flex-direction: row; - flex-wrap: wrap; -} - -@media (max-width: 767.98px) { - .project-toolbar-right .dropdown .menu { - left: auto !important; - right: auto !important; - } -} - .project-column { background-color: var(--color-project-column-bg) !important; border: 1px solid var(--color-secondary) !important;