From 46ff4ae85b379f4c45615ec4b918445128818c34 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 11:52:15 +0200 Subject: [PATCH 1/6] WIP --- templates/shared/issuelist.tmpl | 122 ++++++++++++++++--------------- web_src/css/shared/issuelist.css | 47 ++++++------ 2 files changed, 88 insertions(+), 81 deletions(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 6d61b9fa99714..319db38c4d0df 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -1,8 +1,8 @@
{{$approvalCounts := .ApprovalCounts}} {{range .Issues}} -
  • -
    +
  • +
    {{if $.CanWriteIssuesOrPulls}} {{end}} @@ -10,22 +10,50 @@ {{template "shared/issueicon" .}}
    • -
    -
    - {{RenderEmoji $.Context .Title | RenderCodeBlock}} - {{if .IsPull}} - {{if (index $.CommitStatuses .PullRequest.ID)}} - {{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}} +
    +
    +
    + {{RenderEmoji $.Context .Title | RenderCodeBlock}} + {{if .IsPull}} + {{if (index $.CommitStatuses .PullRequest.ID)}} + {{template "repo/commit_statuses" dict "Status" (index $.CommitLastStatus .PullRequest.ID) "Statuses" (index $.CommitStatuses .PullRequest.ID) "root" $}} + {{end}} {{end}} - {{end}} - - {{range .Labels}} - {{RenderLabel $.Context .}} + + {{range .Labels}} + {{RenderLabel $.Context .}} + {{end}} + +
    + {{if or .TotalTrackedTime .Assignees .NumComments}} +
    + {{if .TotalTrackedTime}} +
    + {{svg "octicon-clock" 16 }} + {{.TotalTrackedTime | Sec2Time}} +
    + {{end}} + {{if .Assignees}} +
    + {{range .Assignees}} + + {{avatar $.Context . 20}} + + {{end}} +
    + {{end}} + {{if .NumComments}} +
    + + {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} + +
    {{end}} - +
    + {{end}}
    - + {{if eq $.listType "dashboard"}} {{.Repo.FullName}}#{{.Index}} {{else}} @@ -41,14 +69,14 @@ {{$.locale.Tr .GetLastEventLabelFake $timeStr (.Poster.GetDisplayName | Escape) | Safe}} {{end}} {{if .IsPull}} -
    +
    {{/* inline to remove the spaces between spans */}} {{if ne .RepoID .PullRequest.BaseRepoID}}{{.PullRequest.BaseRepo.OwnerName}}:{{end}}{{.PullRequest.BaseBranch}}
    - {{svg "gitea-double-chevron-left" 12 "gt-mx-1"}} + {{svg "gitea-double-chevron-left" 12}} {{if .PullRequest.HeadRepo}}
    @@ -60,32 +88,32 @@
    {{end}} {{if and .Milestone (ne $.listType "milestone")}} - - {{svg "octicon-milestone" 14 "gt-mr-2"}}{{.Milestone.Name}} + + {{svg "octicon-milestone" 14}}{{.Milestone.Name}} {{end}} {{if .Project}} - - {{svg .Project.IconName 14 "gt-mr-2"}}{{.Project.Title}} + + {{svg .Project.IconName 14}}{{.Project.Title}} {{end}} {{if .Ref}} - - {{svg "octicon-git-branch" 14 "gt-mr-2"}}{{index $.IssueRefEndNames .ID}} + + {{svg "octicon-git-branch" 14}}{{index $.IssueRefEndNames .ID}} {{end}} {{$tasks := .GetTasks}} {{if gt $tasks 0}} {{$tasksDone := .GetTasksDone}} - - {{svg "octicon-checklist" 14 "gt-mr-2"}}{{$tasksDone}} / {{$tasks}} + + {{svg "octicon-checklist" 14}}{{$tasksDone}} / {{$tasks}} {{end}} {{if ne .DeadlineUnix 0}} - + - {{svg "octicon-calendar" 14 "gt-mr-2"}} + {{svg "octicon-calendar" 14}} {{DateTime "short" .DeadlineUnix}} @@ -95,58 +123,32 @@ {{$rejectOfficial := call $approvalCounts .ID "reject"}} {{$waitingOfficial := call $approvalCounts .ID "waiting"}} {{if gt $approveOfficial 0}} - - {{svg "octicon-check" 14 "gt-mr-1"}} + + {{svg "octicon-check" 14}} {{$.locale.TrN $approveOfficial "repo.pulls.approve_count_1" "repo.pulls.approve_count_n" $approveOfficial}} {{end}} {{if gt $rejectOfficial 0}} - - {{svg "octicon-diff" 14 "gt-mr-2"}} + + {{svg "octicon-diff" 14}} {{$.locale.TrN $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n" $rejectOfficial}} {{end}} {{if gt $waitingOfficial 0}} - - {{svg "octicon-eye" 14 "gt-mr-2"}} + + {{svg "octicon-eye" 14}} {{$.locale.TrN $waitingOfficial "repo.pulls.waiting_count_1" "repo.pulls.waiting_count_n" $waitingOfficial}} {{end}} {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}} - + {{svg "octicon-x" 14}} {{$.locale.TrN (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n" (len .PullRequest.ConflictedFiles)}} {{end}} {{end}}
    -
    - {{if or .TotalTrackedTime .Assignees .NumComments}} -
    - {{if .TotalTrackedTime}} -
    - {{svg "octicon-clock" 16 "gt-mr-2"}} - {{.TotalTrackedTime | Sec2Time}} -
    - {{end}} - {{if .Assignees}} -
    - {{range .Assignees}} - - {{avatar $.Context . 20}} - - {{end}} -
    - {{end}} - {{if .NumComments}} -
    - - {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} - -
    - {{end}} -
    - {{end}} +
    {{end}} {{if .IssueIndexerUnavailable}} diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 7f9e49831a74b..01b61f82820cc 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -3,6 +3,30 @@ margin-top: 1rem; } +.issue.list .item { + display: flex; + align-items: baseline; + padding: 8px 0; +} + +.issue.list .item .issue-item-left { + display: flex; + align-items: start; +} + +.issue.list .item .issue-item-block { + display: flex; + flex-direction: column; + width: 100%; +} + +.issue.list .item .issue-item-header { + display: flex; + justify-content: space-between; + align-items: center; + flex-wrap: wrap; +} + .issue.list a:not(.label):hover { color: var(--color-primary) !important; } @@ -64,7 +88,7 @@ display: flex; align-items: center; flex-wrap: wrap; - margin: .125rem 0; + gap: .25rem; } .issue.list > .item .title { @@ -94,12 +118,6 @@ word-break: break-word; } -.issue.list > .item .desc .time-since, -.issue.list > .item .desc a { - margin-left: 0.25rem; - margin-right: 0.25rem; -} - .issue.list > .item .desc .waiting, .issue.list > .item .desc .approvals, .issue.list > .item .desc .rejects { @@ -135,27 +153,14 @@ padding-left: 5px; } -.issue.list > .item .desc a.milestone, -.issue.list > .item .desc a.project { - margin-left: 5px; -} - -.issue.list > .item .desc a.ref { - margin-left: 8px; -} - -.issue.list > .item .desc a.ref span { - margin-right: -4px; -} - .issue.list .branches { display: inline-flex; - padding: 0 4px; } .issue.list .branches .branch { background-color: var(--color-secondary-alpha-40); border-radius: 3px; + padding: 0 4px; } .issue.list .branches .truncated-name { From 6c1cb2af5a84ba4eff727d711091f296d781cdb1 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 14:22:01 +0200 Subject: [PATCH 2/6] fix shared styles, additional fixes --- templates/package/shared/list.tmpl | 6 +- templates/package/shared/versionlist.tmpl | 6 +- templates/repo/actions/runs_list.tmpl | 12 +-- .../repo/issue/labels/edit_delete_label.tmpl | 2 +- templates/shared/issuelist.tmpl | 18 ++--- web_src/css/shared/issuelist.css | 73 ++++--------------- 6 files changed, 38 insertions(+), 79 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index b2f339285f066..79a2d885fb37b 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -14,13 +14,13 @@
    {{range .PackageDescriptors}} -
  • +
  • -
    +
    {{.Package.Name}} {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}}
    -
    +
    {{$timeStr := TimeSinceUnix .Version.CreatedUnix $.locale}} {{$hasRepositoryAccess := false}} {{if .Repository}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index afd92efff9330..feba8ef14579a 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -20,12 +20,12 @@
    {{range .PackageDescriptors}} -
  • +
  • -
    +
    {{.Version.LowerVersion}}
    -
    +
    {{$.locale.Tr "packages.published_by" (TimeSinceUnix .Version.CreatedUnix $.locale) .Creator.HomeLink (.Creator.GetDisplayName | Escape) | Safe}}
    diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index ce664eb458be7..87b5ed69de155 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -6,17 +6,17 @@
    {{end}} {{range .Runs}} -
  • -
    +
  • +
    {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
    -
    +
    {{- .Title -}}
    -
    +
    {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}} : {{$.locale.Tr "actions.runs.commit"}} {{ShortSha .CommitSHA}} @@ -32,8 +32,8 @@ {{end}}
    -
    {{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}
    -
    {{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}
    +
    {{svg "octicon-calendar" 16}}{{TimeSinceUnix .Updated $.locale}}
    +
    {{svg "octicon-stopwatch" 16}}{{.Duration}}
    • {{end}} diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index b4eb6be7fcd1d..ae36c0e209315 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -30,7 +30,7 @@

    {{.locale.Tr "repo.issues.label_exclusive_desc" | Safe}} -
    +
    {{svg "octicon-alert"}} {{.locale.Tr "repo.issues.label_exclusive_warning" | Safe}}
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 319db38c4d0df..c8a14a649f367 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -10,9 +10,9 @@ {{template "shared/issueicon" .}}
    -
    +
    -
    +
    {{RenderEmoji $.Context .Title | RenderCodeBlock}} {{if .IsPull}} {{if (index $.CommitStatuses .PullRequest.ID)}} @@ -26,15 +26,15 @@
    {{if or .TotalTrackedTime .Assignees .NumComments}} -
    +
    {{if .TotalTrackedTime}} -
    - {{svg "octicon-clock" 16 }} +
    + {{svg "octicon-clock" 16}} {{.TotalTrackedTime | Sec2Time}}
    {{end}} {{if .Assignees}} -
    +
    {{range .Assignees}} {{avatar $.Context . 20}} @@ -43,16 +43,16 @@
    {{end}} {{if .NumComments}} -
    +
    - {{svg "octicon-comment" 16 "gt-mr-2"}}{{.NumComments}} + {{svg "octicon-comment" 16}}{{.NumComments}}
    {{end}}
    {{end}}
    -
    +
    {{if eq $.listType "dashboard"}} {{.Repo.FullName}}#{{.Index}} diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 01b61f82820cc..616e55c9fc695 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -14,7 +14,7 @@ align-items: start; } -.issue.list .item .issue-item-block { +.issue.list .item .issue-item-main { display: flex; flex-direction: column; width: 100%; @@ -36,14 +36,13 @@ margin-top: 1px; } -.issue.list > .item .issue-item-icons-right > * + * { - margin-left: 0.5rem; +.issue.list .item .issue-item-right { + display: flex; + gap: 0.5rem; } -.issue.list > .item .issue-item-main { - flex: 1; - display: flex; - flex-direction: column; +.issue.list > .action-item { + align-items: normal; } .issue.list > .item .action-item-center { @@ -61,7 +60,7 @@ color: var(--color-text-light); } -.issue.list > .item .issue-item-top-row { +.issue.list > .item .issue-item-title { max-width: 100%; color: var(--color-text); font-size: 16px; @@ -69,7 +68,7 @@ font-weight: var(--font-weight-semibold); } -.issue.list > .item .issue-item-top-row a.index { +.issue.list > .item .issue-item-title a.index { max-width: fit-content; display: -webkit-box; -webkit-box-orient: vertical; @@ -78,81 +77,41 @@ word-break: break-all; } -.issue.list > .item .labels-list { - position: relative; - top: -1.5px; +.issue.list > .item .title { + color: var(--color-text); + word-break: break-word; } -.issue.list > .item .issue-item-bottom-row { +.issue.list > .item .issue-item-body { font-size: 13px; display: flex; align-items: center; flex-wrap: wrap; gap: .25rem; -} - -.issue.list > .item .title { - color: var(--color-text); - word-break: break-word; -} - -.issue.list > .item .issue-item-icon-right { - min-width: 2rem; -} - -.issue.list > .item .assignee { - position: relative; - top: -2px; -} - -.issue.list > .item .assignee img { - margin-right: 2px; -} - -.issue.list > .item .desc { color: var(--color-text-light-2); } -.issue.list > .item .desc a { +.issue.list > .item .issue-item-body a { color: inherit; word-break: break-word; } -.issue.list > .item .desc .waiting, -.issue.list > .item .desc .approvals, -.issue.list > .item .desc .rejects { - padding-left: 5px; -} - -.issue.list > .item .desc .checklist { - padding-left: 5px; -} - -.issue.list > .item .desc .checklist progress { +.issue.list > .item .issue-item-body .checklist progress { margin-left: 2px; width: 80px; height: 6px; display: inline-block; border-radius: 3px; - vertical-align: 2px !important; } -.issue.list > .item .desc .checklist progress::-webkit-progress-value { +.issue.list > .item .issue-item-body .checklist progress::-webkit-progress-value { background-color: var(--color-secondary-dark-4); } -.issue.list > .item .desc .checklist progress::-moz-progress-bar { +.issue.list > .item .issue-item-body .checklist progress::-moz-progress-bar { background-color: var(--color-secondary-dark-4); } -.issue.list > .item .desc .conflicting { - padding-left: 5px; -} - -.issue.list > .item .desc .due-date { - padding-left: 5px; -} - .issue.list .branches { display: inline-flex; } From ecf59a9d9aee3564e1bc3dc5bca5fbf763d5f23c Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 14:43:24 +0200 Subject: [PATCH 3/6] restore accidentially removed class --- templates/repo/issue/labels/edit_delete_label.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index ae36c0e209315..b4eb6be7fcd1d 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -30,7 +30,7 @@

    {{.locale.Tr "repo.issues.label_exclusive_desc" | Safe}} -
    +
    {{svg "octicon-alert"}} {{.locale.Tr "repo.issues.label_exclusive_warning" | Safe}}
    From 3233463c5a65d50ec4d81353f218b8d48416c253 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 15:18:05 +0200 Subject: [PATCH 4/6] remove trailing whitespace --- templates/shared/issuelist.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index c8a14a649f367..7d80e0473670a 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -148,7 +148,7 @@ {{end}} {{end}}
    -
    +
    {{end}} {{if .IssueIndexerUnavailable}} From 87b50349a1d157e32495b04279697189ad4c0d34 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 22:29:38 +0200 Subject: [PATCH 5/6] Update web_src/css/shared/issuelist.css Co-authored-by: silverwind --- web_src/css/shared/issuelist.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 616e55c9fc695..a49054b7ba986 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -79,7 +79,7 @@ .issue.list > .item .title { color: var(--color-text); - word-break: break-word; + overflow-wrap: anywhere; } .issue.list > .item .issue-item-body { From cf765e66049fe419d51c965c9775f88c55e38a96 Mon Sep 17 00:00:00 2001 From: Denys Konovalov Date: Fri, 7 Jul 2023 22:30:16 +0200 Subject: [PATCH 6/6] Update issuelist.css --- web_src/css/shared/issuelist.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index a49054b7ba986..82fafedec00a8 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -11,7 +11,7 @@ .issue.list .item .issue-item-left { display: flex; - align-items: start; + align-items: flex-start; } .issue.list .item .issue-item-main {