From 10e0fe678ce7d28d6d0425f7aeca8a7c97824a50 Mon Sep 17 00:00:00 2001 From: silverwind Date: Wed, 27 Mar 2024 23:31:43 +0100 Subject: [PATCH 1/7] Pulse page improvements --- templates/repo/pulse.tmpl | 24 ++++++++++++++---------- web_src/css/repo.css | 17 ++++++++++++++++- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index cfb3ec1d3d1e3..330b6c72fd0d0 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -25,12 +25,14 @@
{{if gt .Activity.ActivePRCount 0}}
- - + {{if gt .Activity.MergedPRPerc 0}} + + {{end}} +
{{else}}
- +
{{end}} {{ctx.Locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount}} @@ -40,7 +42,9 @@
{{if gt .Activity.ActiveIssueCount 0}}
- + {{if gt .Activity.ClosedIssuePerc 0}} + + {{end}}
{{else}} @@ -108,7 +112,7 @@ {{end}} {{if gt .Activity.PublishedReleaseCount 0}} -

+

{{svg "octicon-tag" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.releases_published_by" (ctx.Locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) @@ -130,7 +134,7 @@ {{end}} {{if gt .Activity.MergedPRCount 0}} -

+

{{svg "octicon-git-pull-request" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.prs_merged_by" (ctx.Locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) @@ -149,7 +153,7 @@ {{end}} {{if gt .Activity.OpenedPRCount 0}} -

+

{{svg "octicon-git-branch" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.prs_opened_by" (ctx.Locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) @@ -168,7 +172,7 @@ {{end}} {{if gt .Activity.ClosedIssueCount 0}} -

+

{{svg "octicon-issue-closed" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.issues_closed_from" (ctx.Locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) @@ -187,7 +191,7 @@ {{end}} {{if gt .Activity.OpenedIssueCount 0}} -

+

{{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.issues_created_by" (ctx.Locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) @@ -206,7 +210,7 @@ {{end}} {{if gt .Activity.UnresolvedIssueCount 0}} -

+

{{svg "octicon-comment-discussion" 16 "tw-mr-2"}} {{ctx.Locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 18f28dc4a6e0d..9f08bc94656fb 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2361,14 +2361,29 @@ .stats-table { display: table; width: 100%; + margin: 6px 0; + border-spacing: 2px; } .stats-table .table-cell { display: table-cell; + border-radius: 4px; } .stats-table .table-cell.tiny { - height: 0.5em; + height: 8px; +} + +.stats-table .table-cell:first-child { + border-radius: 4px 0 0 4px; +} + +.stats-table .table-cell:last-child { + border-radius: 0 4px 4px 0; +} + +.stats-table .table-cell:only-child { + border-radius: 4px; } .labels-list .label { From 7578f1dd676241fecc0eebd445f54292b5ac4ee7 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 28 Mar 2024 00:18:05 +0100 Subject: [PATCH 2/7] optimize selectors --- web_src/css/repo.css | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/web_src/css/repo.css b/web_src/css/repo.css index 9f08bc94656fb..00aacaa222b4e 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -2367,7 +2367,6 @@ .stats-table .table-cell { display: table-cell; - border-radius: 4px; } .stats-table .table-cell.tiny { @@ -2375,15 +2374,13 @@ } .stats-table .table-cell:first-child { - border-radius: 4px 0 0 4px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; } .stats-table .table-cell:last-child { - border-radius: 0 4px 4px 0; -} - -.stats-table .table-cell:only-child { - border-radius: 4px; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; } .labels-list .label { From 01c7afbb680383d92bcf8e2622c7948f3e65eb9e Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 28 Mar 2024 10:39:26 +0100 Subject: [PATCH 3/7] Update templates/repo/pulse.tmpl --- templates/repo/pulse.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index 330b6c72fd0d0..295dcdee3e662 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -32,7 +32,7 @@
{{else}}
- +
{{end}} {{ctx.Locale.TrN .Activity.ActivePRCount "repo.activity.active_prs_count_1" "repo.activity.active_prs_count_n" .Activity.ActivePRCount}} From fc916d33fea466b2d9f3eccf07d162d0e2974097 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 28 Mar 2024 10:39:49 +0100 Subject: [PATCH 4/7] Update templates/repo/pulse.tmpl --- templates/repo/pulse.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index 295dcdee3e662..9d8ec24921073 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -43,7 +43,7 @@ {{if gt .Activity.ActiveIssueCount 0}}
{{if gt .Activity.ClosedIssuePerc 0}} - + {{end}}
From 5e40f1ed8b7be333a20266b932016dfa556f93f1 Mon Sep 17 00:00:00 2001 From: silverwind Date: Thu, 28 Mar 2024 10:40:11 +0100 Subject: [PATCH 5/7] Update templates/repo/pulse.tmpl --- templates/repo/pulse.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index 9d8ec24921073..9f879e8fcbe23 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -45,7 +45,7 @@ {{if gt .Activity.ClosedIssuePerc 0}} {{end}} - +
{{else}}
From 62037d6aa3e85e7242023ac98e3fe26b9a881235 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 13 Apr 2024 22:45:35 +0200 Subject: [PATCH 6/7] remove all text-transform --- templates/repo/pulse.tmpl | 12 ++++++------ web_src/css/dashboard.css | 1 - web_src/css/modules/divider.css | 1 - web_src/css/modules/header.css | 1 - web_src/css/modules/label.css | 1 - 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index 9f879e8fcbe23..a2e41e7f9572f 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -112,7 +112,7 @@ {{end}} {{if gt .Activity.PublishedReleaseCount 0}} -

+

{{svg "octicon-tag" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.releases_published_by" (ctx.Locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) @@ -134,7 +134,7 @@ {{end}} {{if gt .Activity.MergedPRCount 0}} -

+

{{svg "octicon-git-pull-request" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.prs_merged_by" (ctx.Locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) @@ -153,7 +153,7 @@ {{end}} {{if gt .Activity.OpenedPRCount 0}} -

+

{{svg "octicon-git-branch" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.prs_opened_by" (ctx.Locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) @@ -172,7 +172,7 @@ {{end}} {{if gt .Activity.ClosedIssueCount 0}} -

+

{{svg "octicon-issue-closed" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.issues_closed_from" (ctx.Locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) @@ -191,7 +191,7 @@ {{end}} {{if gt .Activity.OpenedIssueCount 0}} -

+

{{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.issues_created_by" (ctx.Locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) @@ -210,7 +210,7 @@ {{end}} {{if gt .Activity.UnresolvedIssueCount 0}} -

+

{{svg "octicon-comment-discussion" 16 "tw-mr-2"}} {{ctx.Locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

diff --git a/web_src/css/dashboard.css b/web_src/css/dashboard.css index d61e0c1cf2908..0962215ac6ad8 100644 --- a/web_src/css/dashboard.css +++ b/web_src/css/dashboard.css @@ -7,7 +7,6 @@ .dashboard.feeds .context.user.menu .ui.header, .dashboard.issues .context.user.menu .ui.header { font-size: 1rem; - text-transform: none; } .dashboard.feeds .filter.menu, diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index 48560bd3d9089..bf19118c86615 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -2,7 +2,6 @@ margin: 10px 0; height: 0; font-weight: var(--font-weight-medium); - text-transform: uppercase; color: var(--color-text); font-size: 1rem; width: 100%; diff --git a/web_src/css/modules/header.css b/web_src/css/modules/header.css index 05381e1185e8b..9cec5fcbe6322 100644 --- a/web_src/css/modules/header.css +++ b/web_src/css/modules/header.css @@ -9,7 +9,6 @@ font-family: var(--fonts-regular); font-weight: var(--font-weight-medium); line-height: 1.28571429; - text-transform: none; } .ui.header:first-child { diff --git a/web_src/css/modules/label.css b/web_src/css/modules/label.css index 0512c5fddbb03..32e772ea5b0f5 100644 --- a/web_src/css/modules/label.css +++ b/web_src/css/modules/label.css @@ -10,7 +10,6 @@ background: var(--color-label-bg); color: var(--color-label-text); padding: 0.3em 0.5em; - text-transform: none; font-size: 0.85714286rem; font-weight: var(--font-weight-medium); border: 0 solid transparent; From ad3bd5dd74c9a33e0783bc443855609c4f698749 Mon Sep 17 00:00:00 2001 From: silverwind Date: Sat, 13 Apr 2024 22:46:52 +0200 Subject: [PATCH 7/7] add h4.divider --- templates/repo/pulse.tmpl | 12 ++++++------ web_src/css/modules/divider.css | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/templates/repo/pulse.tmpl b/templates/repo/pulse.tmpl index a2e41e7f9572f..bc25563d488b2 100644 --- a/templates/repo/pulse.tmpl +++ b/templates/repo/pulse.tmpl @@ -112,7 +112,7 @@ {{end}} {{if gt .Activity.PublishedReleaseCount 0}} -

+

{{svg "octicon-tag" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.releases_published_by" (ctx.Locale.TrN .Activity.PublishedReleaseCount "repo.activity.title.releases_1" "repo.activity.title.releases_n" .Activity.PublishedReleaseCount) @@ -134,7 +134,7 @@ {{end}} {{if gt .Activity.MergedPRCount 0}} -

+

{{svg "octicon-git-pull-request" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.prs_merged_by" (ctx.Locale.TrN .Activity.MergedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.MergedPRCount) @@ -153,7 +153,7 @@ {{end}} {{if gt .Activity.OpenedPRCount 0}} -

+

{{svg "octicon-git-branch" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.prs_opened_by" (ctx.Locale.TrN .Activity.OpenedPRCount "repo.activity.title.prs_1" "repo.activity.title.prs_n" .Activity.OpenedPRCount) @@ -172,7 +172,7 @@ {{end}} {{if gt .Activity.ClosedIssueCount 0}} -

+

{{svg "octicon-issue-closed" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.issues_closed_from" (ctx.Locale.TrN .Activity.ClosedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.ClosedIssueCount) @@ -191,7 +191,7 @@ {{end}} {{if gt .Activity.OpenedIssueCount 0}} -

+

{{svg "octicon-issue-opened" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.activity.title.issues_created_by" (ctx.Locale.TrN .Activity.OpenedIssueCount "repo.activity.title.issues_1" "repo.activity.title.issues_n" .Activity.OpenedIssueCount) @@ -210,7 +210,7 @@ {{end}} {{if gt .Activity.UnresolvedIssueCount 0}} -

+

{{svg "octicon-comment-discussion" 16 "tw-mr-2"}} {{ctx.Locale.TrN .Activity.UnresolvedIssueCount "repo.activity.title.unresolved_conv_1" "repo.activity.title.unresolved_conv_n" .Activity.UnresolvedIssueCount}}

diff --git a/web_src/css/modules/divider.css b/web_src/css/modules/divider.css index bf19118c86615..acc8408f37600 100644 --- a/web_src/css/modules/divider.css +++ b/web_src/css/modules/divider.css @@ -7,6 +7,11 @@ width: 100%; } +h4.divider { + margin-top: 1.25rem; + margin-bottom: 1.25rem; +} + .divider:not(.divider-text) { border-top: 1px solid var(--color-secondary); }