From e3e0dd42fc686b503786d5cb271be61ed8946b2a Mon Sep 17 00:00:00 2001 From: silverwind Date: Fri, 30 Jun 2023 00:10:44 +0200 Subject: [PATCH 1/9] Actions list enhancements --- templates/repo/actions/list.tmpl | 1 - templates/repo/actions/runs_list.tmpl | 15 +++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/templates/repo/actions/list.tmpl b/templates/repo/actions/list.tmpl index 46cbb3467089b..f4f0aa9d6d957 100644 --- a/templates/repo/actions/list.tmpl +++ b/templates/repo/actions/list.tmpl @@ -6,7 +6,6 @@
{{.locale.Tr "actions.runs.all_workflows"}} -
{{range .workflows}} {{.Entry.Name}} {{if .ErrMsg}} diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index bfd5aabe55b3a..3dbf9057f3c29 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -16,10 +16,13 @@ {{- .Title -}}
-
+
{{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}}: {{$.locale.Tr "actions.runs.commit"}} - {{ShortSha .CommitSHA}}{{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}} - + + {{ShortSha .CommitSHA}} + + {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}} + {{if .RefLink}} {{.PrettyRef}} {{else}} @@ -28,9 +31,9 @@
-
-
{{TimeSinceUnix .Updated $.locale}}
-
{{.Duration}}
+
+
{{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}
+
{{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}
{{end}} From fc823828283aa0831e00b4e7bed1255bb865a1bb Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 3 Jul 2023 21:24:03 +0200 Subject: [PATCH 2/9] misc tweaks, add author link --- templates/repo/actions/runs_list.tmpl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 3dbf9057f3c29..5e05bb7c24ee9 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -6,22 +6,23 @@
{{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"}} - +
    + {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}} + {{ShortSha .CommitSHA}} - {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}} + {{$.locale.Tr "actions.runs.pushed_by"}} + {{.TriggerUser.GetDisplayName}} {{if .RefLink}} {{.PrettyRef}} @@ -31,7 +32,7 @@
    -
    +
    {{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}
    {{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}
    From 3f8150a369b341093ca4b2ddd7d7949dd48101bf Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 3 Jul 2023 23:03:06 +0200 Subject: [PATCH 3/9] align --- templates/repo/actions/runs_list.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 5e05bb7c24ee9..1b56e81436b64 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -21,8 +21,8 @@ {{ShortSha .CommitSHA}} - {{$.locale.Tr "actions.runs.pushed_by"}} - {{.TriggerUser.GetDisplayName}} + {{$.locale.Tr "actions.runs.pushed_by"}} + {{.TriggerUser.GetDisplayName}} {{if .RefLink}} {{.PrettyRef}} From 7b316540db3973a7b4d9f40cc707c238a34dc6d1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 3 Jul 2023 23:42:31 +0200 Subject: [PATCH 4/9] move branch ref to own column, remove label transition --- options/locale/locale_en-US.ini | 2 +- templates/repo/actions/runs_list.tmpl | 20 ++++++++++---------- web_src/css/base.css | 1 + web_src/css/shared/issuelist.css | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 6d0f29eddbfe2..f10d6620ff0d6 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3463,7 +3463,7 @@ runners.reset_registration_token_success = Runner registration token reset succe runs.all_workflows = All Workflows runs.commit = Commit -runs.pushed_by = Pushed by +runs.pushed_by = pushed by runs.invalid_workflow_helper = Workflow config file is invalid. Please check your config file: %s runs.no_matching_runner_helper = No matching runner: %s runs.actor = Actor diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 1b56e81436b64..6ff56356de339 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -18,21 +18,21 @@
    {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}} - - {{ShortSha .CommitSHA}} - + : {{$.locale.Tr "actions.runs.commit"}} + {{ShortSha .CommitSHA}} {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}} - - {{if .RefLink}} - {{.PrettyRef}} - {{else}} - {{.PrettyRef}} - {{end}}
    -
    +
    + {{if .RefLink}} + {{.PrettyRef}} + {{else}} + {{.PrettyRef}} + {{end}} +
    +
    {{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}
    {{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}
    diff --git a/web_src/css/base.css b/web_src/css/base.css index 8b8d376c57890..cc74d2b3a8a33 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1643,6 +1643,7 @@ i.icon.centerlock { .ui.label { padding: 0.3em 0.5em; + transition: none; } .ui.label, diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index b20fd1a80e1b9..4847fb8ae2945 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -24,7 +24,7 @@ width: 80%; } -.issue.list > .item .issue-item-right { +.issue.list > .item .action-item-right { width: 15%; } From e886eeb2a8d7c4446b6958038ba47f25147f9c82 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 3 Jul 2023 23:50:27 +0200 Subject: [PATCH 5/9] tweak single actions view header --- web_src/js/components/RepoActionView.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/web_src/js/components/RepoActionView.vue b/web_src/js/components/RepoActionView.vue index c247967161c36..f244720fe0444 100644 --- a/web_src/js/components/RepoActionView.vue +++ b/web_src/js/components/RepoActionView.vue @@ -20,12 +20,12 @@
    {{ run.commit.localeCommit }} - {{ run.commit.shortSHA }} + {{ run.commit.shortSHA }} + {{ run.commit.localePushedBy }} + {{ run.commit.pusher.displayName }} {{ run.commit.branch.name }} - {{ run.commit.localePushedBy }} - {{ run.commit.pusher.displayName }}
    @@ -507,7 +507,6 @@ export function initRepositoryActionView() { .action-view-header { margin-top: 8px; - margin-bottom: 4px; } .action-info-summary { @@ -522,14 +521,14 @@ export function initRepositoryActionView() { .action-info-summary-title-text { font-size: 20px; - margin: 0 0 0 5px; + margin: 0 0 0 8px; flex: 1; } .action-commit-summary { display: flex; gap: 5px; - margin: 5px 0 0 25px; + margin: 0 0 0 28px; } .action-view-left, .action-view-right { From cb5f08433b621589c57b2a3644450eae349f3d51 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 4 Jul 2023 00:02:50 +0200 Subject: [PATCH 6/9] move shared styles into issue-item-main --- templates/package/shared/list.tmpl | 2 +- templates/package/shared/versionlist.tmpl | 2 +- templates/repo/actions/runs_list.tmpl | 4 ++-- templates/shared/issuelist.tmpl | 2 +- web_src/css/shared/issuelist.css | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 3d14eda3efa19..0ab7e1c7e1f87 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -16,7 +16,7 @@
    {{range .PackageDescriptors}}
  • -
    +
    {{.Package.Name}} {{svg .Package.Type.SVGName 16}} {{.Package.Type.Name}} diff --git a/templates/package/shared/versionlist.tmpl b/templates/package/shared/versionlist.tmpl index 23cd0bfcc0ded..094baf439b501 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -22,7 +22,7 @@
    {{range .PackageDescriptors}}
  • -
    +
    {{.Version.LowerVersion}}
    diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 6ff56356de339..bfacd5f1b5b61 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -10,7 +10,7 @@
    {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
    -
    +
    {{- .Title -}} @@ -25,7 +25,7 @@
    -
    +
    {{if .RefLink}} {{.PrettyRef}} {{else}} diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 192911d13a3b0..52dbe3434db1a 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -10,7 +10,7 @@ {{template "shared/issueicon" .}}
    -
    +
    {{RenderEmoji $.Context .Title | RenderCodeBlock}} {{if .IsPull}} diff --git a/web_src/css/shared/issuelist.css b/web_src/css/shared/issuelist.css index 4847fb8ae2945..1b34a0d76fbe3 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -18,6 +18,9 @@ .issue.list > .item .issue-item-main { width: 100%; + flex: 1; + display: flex; + flex-direction: column; } .issue.list > .item .action-item-main { From 54fe4d501c7649f9ac8bd8b98a133b1dd112fabf Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 4 Jul 2023 00:26:47 +0200 Subject: [PATCH 7/9] move some issue-list styles to css --- templates/package/shared/list.tmpl | 2 +- templates/package/shared/versionlist.tmpl | 2 +- templates/repo/actions/runs_list.tmpl | 8 ++++---- templates/shared/issuelist.tmpl | 2 +- web_src/css/shared/issuelist.css | 18 ++++++++++++++---- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/templates/package/shared/list.tmpl b/templates/package/shared/list.tmpl index 0ab7e1c7e1f87..6ac930e5c7c6f 100644 --- a/templates/package/shared/list.tmpl +++ b/templates/package/shared/list.tmpl @@ -21,7 +21,7 @@ {{.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 094baf439b501..9fc53d806c93a 100644 --- a/templates/package/shared/versionlist.tmpl +++ b/templates/package/shared/versionlist.tmpl @@ -26,7 +26,7 @@
    {{.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 bfacd5f1b5b61..459eaa49f3ba3 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -11,12 +11,12 @@ {{template "repo/actions/status" (dict "status" .Status.String "locale" $.locale)}}
    -
    +
    {{- .Title -}}
    -
    +
    {{if not $.CurWorkflow}}{{.WorkflowID}} {{end}}#{{.Index}} : {{$.locale.Tr "actions.runs.commit"}} {{ShortSha .CommitSHA}} @@ -25,14 +25,14 @@
    -
    +
    {{if .RefLink}} {{.PrettyRef}} {{else}} {{.PrettyRef}} {{end}}
    -
    +
    {{svg "octicon-calendar" 16 "gt-mr-2"}}{{TimeSinceUnix .Updated $.locale}}
    {{svg "octicon-stopwatch" 16 "gt-mr-2"}}{{.Duration}}
    diff --git a/templates/shared/issuelist.tmpl b/templates/shared/issuelist.tmpl index 52dbe3434db1a..6d61b9fa99714 100644 --- a/templates/shared/issuelist.tmpl +++ b/templates/shared/issuelist.tmpl @@ -24,7 +24,7 @@ {{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 1b34a0d76fbe3..4fda06be3b4e0 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -17,18 +17,24 @@ } .issue.list > .item .issue-item-main { - width: 100%; flex: 1; display: flex; flex-direction: column; } -.issue.list > .item .action-item-main { - width: 80%; +.issue.list > .item .action-item-center { + display: flex; + align-items: center; + padding-left: 4px; + padding-right: 12px; } .issue.list > .item .action-item-right { - width: 15%; + flex: 0 0 15%; + display: flex; + flex-direction: column; + gap: .5rem; + color: var(--color-text-light); } .issue.list > .item .issue-item-top-row { @@ -55,6 +61,10 @@ .issue.list > .item .issue-item-bottom-row { font-size: 13px; + display: flex; + align-items: center; + flex-wrap: wrap; + margin: .125rem 0; } .issue.list > .item .title { From d4a8e81e93afbe25b0ecffabb88d9086f77faed9 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 4 Jul 2023 00:29:41 +0200 Subject: [PATCH 8/9] reduce gap to not increase row height --- 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 4fda06be3b4e0..7f9e49831a74b 100644 --- a/web_src/css/shared/issuelist.css +++ b/web_src/css/shared/issuelist.css @@ -33,7 +33,7 @@ flex: 0 0 15%; display: flex; flex-direction: column; - gap: .5rem; + gap: 3px; color: var(--color-text-light); } From 2f075d42e31cba720dc2dd1400fedb218888e2ff Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 4 Jul 2023 10:34:50 +0200 Subject: [PATCH 9/9] fix template lint --- templates/repo/actions/runs_list.tmpl | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/repo/actions/runs_list.tmpl b/templates/repo/actions/runs_list.tmpl index 459eaa49f3ba3..ce664eb458be7 100644 --- a/templates/repo/actions/runs_list.tmpl +++ b/templates/repo/actions/runs_list.tmpl @@ -22,7 +22,6 @@ {{ShortSha .CommitSHA}} {{$.locale.Tr "actions.runs.pushed_by"}} {{.TriggerUser.GetDisplayName}} -