From 19d928871c3bd9d05ea9eb062af56248dcfe7eae Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 10:59:26 +0200 Subject: [PATCH 01/29] Various CSS and HTML tweaks - Remove various horizontal dividers on repo pages that didn't provide visual benefit - Remove issue-related pill buttons on projects page - Increase contrast of color-secondary on arc-green - Improve notifications icon - Remove some inline styles --- templates/org/member/members.tmpl | 2 +- templates/repo/issue/labels.tmpl | 3 +- templates/repo/issue/list.tmpl | 3 -- templates/repo/issue/milestones.tmpl | 3 +- templates/repo/issue/view.tmpl | 15 ------- templates/repo/issue/view_title.tmpl | 3 +- templates/repo/projects/list.tmpl | 60 +++++++++++++------------- templates/repo/pulls/commits.tmpl | 1 - templates/repo/pulls/files.tmpl | 1 - templates/repo/release/list.tmpl | 4 +- templates/repo/settings/options.tmpl | 6 +-- web_src/css/base.css | 10 ++--- web_src/css/repository.css | 7 +-- web_src/css/repository/issue-list.css | 1 + web_src/css/repository/release-tag.css | 17 +++++--- web_src/css/themes/theme-arc-green.css | 52 +++++++++++----------- 16 files changed, 87 insertions(+), 101 deletions(-) diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index d6ab265ea84c6..3d5b3beebd0f0 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -7,7 +7,7 @@
{{range .Members}}
-
+
{{avatar $.Context . 48}}
{{.Name}}
diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl index 0a25d9c87ff1b..93e264e4cdbf3 100644 --- a/templates/repo/issue/labels.tmpl +++ b/templates/repo/issue/labels.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}}
-
+
{{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
@@ -10,7 +10,6 @@
{{end}}
-
{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}} {{template "repo/issue/labels/label_new" .}} {{end}} diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 8e553ee7bb758..a7311c249033b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -17,9 +17,6 @@ {{end}} {{end}}
- -
-
{{if $.CanWriteIssuesOrPulls}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index ceaad947d2738..4a6037bf035b4 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -2,7 +2,7 @@
{{template "repo/header" .}}
-
+
{{template "repo/issue/navbar" .}} {{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
@@ -10,7 +10,6 @@
{{end}}
-
{{template "base/alert" .}}
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index c92b50444c5ab..6d3ce57fafc32 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -2,21 +2,6 @@
{{template "repo/header" .}}
-
-
- {{template "repo/issue/navbar" .}} -
- {{if and (not .Repository.IsArchived) (not .Issue.IsPull)}} -
- {{if .PageIsIssueList}} - {{.locale.Tr "repo.issues.new"}} - {{else}} - {{.locale.Tr "repo.pulls.new"}} - {{end}} -
- {{end}} -
-
{{if .Issue.IsPull}} {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index cf12daee04ddb..0ab50b8f98d37 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -3,7 +3,7 @@ {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} {{end}} -

+

{{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}}
@@ -103,5 +103,4 @@ {{$.locale.Tr "repo.issues.num_comments" .Issue.NumComments}} {{end}} -
diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 5cd94c626d21d..8df899b6e1474 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -2,41 +2,39 @@
{{template "repo/header" .}}
-
- {{template "repo/issue/navbar" .}} - {{if and .CanWriteProjects (not .Repository.IsArchived)}} -
- {{.locale.Tr "repo.projects.new"}} +
+ -
- {{template "base/alert" .}} -
- - {{svg "octicon-project" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} - - - {{svg "octicon-check" 16 "gt-mr-3"}} - {{.locale.PrettyNumber .ClosedCount}} {{.locale.Tr "repo.issues.closed_title"}} - -
- -
- -
- - {{.locale.Tr "repo.issues.filter_sort"}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - -
- {{.locale.Tr "repo.issues.filter_sort.oldest"}} - {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} - {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+
+ +
+ + {{.locale.Tr "repo.issues.filter_sort"}} + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + +
+ {{.locale.Tr "repo.issues.filter_sort.oldest"}} + {{.locale.Tr "repo.issues.filter_sort.recentupdate"}} + {{.locale.Tr "repo.issues.filter_sort.leastupdate"}} +
+ {{if and .CanWriteProjects (not .Repository.IsArchived)}} + {{.locale.Tr "repo.projects.new"}} + {{end}}
+ {{template "base/alert" .}} +
{{range .Projects}}
  • diff --git a/templates/repo/pulls/commits.tmpl b/templates/repo/pulls/commits.tmpl index bb113da268ff6..1c47673ab3a78 100644 --- a/templates/repo/pulls/commits.tmpl +++ b/templates/repo/pulls/commits.tmpl @@ -8,7 +8,6 @@ {{.locale.Tr "repo.pulls.new"}}
    • -
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}}
    diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl index 1e02dfa3974af..99fb25a2ced32 100644 --- a/templates/repo/pulls/files.tmpl +++ b/templates/repo/pulls/files.tmpl @@ -12,7 +12,6 @@ {{.locale.Tr "repo.pulls.new"}}
    -
    {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} {{template "base/alert" .}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 3d596a49e2b9d..7e15d8727f201 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -20,7 +20,9 @@ {{svg "octicon-git-commit" 16 "gt-mr-2"}}{{ShortSha .Sha1}} - {{template "repo/branch_dropdown" dict "root" $ "release" .}} +
    + {{template "repo/branch_dropdown" dict "root" $ "release" .}} +
    {{end}}
    diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 515854609a1eb..5111432c57530 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -91,7 +91,7 @@ {{$.locale.Tr "repo.settings.mirror_settings.direction.pull"}} {{DateTime "full" .Mirror.UpdatedUnix}} -
    + {{.CsrfTokenHtml}} @@ -169,13 +169,13 @@ {{$.locale.Tr "repo.settings.mirror_settings.direction.push"}} {{if .LastUpdateUnix}}{{DateTime "full" .LastUpdateUnix}}{{else}}{{$.locale.Tr "never"}}{{end}} {{if .LastError}}
    {{$.locale.Tr "error"}}
    {{end}} - + {{$.CsrfTokenHtml}}
    -
    + {{$.CsrfTokenHtml}} diff --git a/web_src/css/base.css b/web_src/css/base.css index ed51892044ccc..8ce7400690b81 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -2584,18 +2584,18 @@ a.ui.basic.label:hover { .notification_count { position: absolute; - left: 5px; - top: -8px; + left: 7px; + top: -9px; min-width: 1.5em; text-align: center; background: var(--color-primary); border: 2px solid var(--color-header-bar); color: var(--color-header-bar); - padding: 2px; + padding: 2.75px; border-radius: 1em; - font-size: 10px; + font-size: 11px; font-weight: 700; - line-height: 0.7; + line-height: .67em; } table th[data-sortt-asc]:hover, diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 259cfda3a1a7e..74cdcab901936 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -659,7 +659,6 @@ .repository.view.issue .title .issue-title .edit-button { float: right; - padding-left: 1rem; } .repository.view.issue .title .issue-title .edit-buttons { @@ -1199,13 +1198,15 @@ .repository .milestone.list { list-style: none; - padding-top: 15px; } .repository .milestone.list > .item { padding-top: 10px; padding-bottom: 10px; - border-bottom: 1px dashed var(--color-secondary); +} + +.repository .milestone.list > .item + .item { + border-top: 1px solid var(--color-secondary); } .repository .milestone.list > .item progress { diff --git a/web_src/css/repository/issue-list.css b/web_src/css/repository/issue-list.css index 2c2d3572e028d..dde3e7f19f812 100644 --- a/web_src/css/repository/issue-list.css +++ b/web_src/css/repository/issue-list.css @@ -3,6 +3,7 @@ flex-wrap: wrap; align-items: flex-start; gap: 1rem; + margin-top: 1rem; } .issue-list-toolbar-left { diff --git a/web_src/css/repository/release-tag.css b/web_src/css/repository/release-tag.css index 6922ce5179651..f64f259b4999d 100644 --- a/web_src/css/repository/release-tag.css +++ b/web_src/css/repository/release-tag.css @@ -1,7 +1,6 @@ .repository.releases #release-list { - border-top: 1px solid var(--color-secondary); - margin-top: 20px; - padding-top: 15px; + margin-top: 12px; + padding-top: 12px; padding-left: 0; } @@ -45,7 +44,7 @@ } .repository.releases #release-list > li .detail { - border-left: 2px solid var(--color-secondary); + border-left: 1px solid var(--color-secondary); } .repository.releases #release-list > li .detail .author img { @@ -92,7 +91,7 @@ z-index: 9; position: absolute; display: block; - left: -6px; + left: -5.5px; top: 40px; border-radius: 100%; border: 2.5px solid var(--color-body); @@ -149,3 +148,11 @@ .repository.new.release .field .attachment_edit { width: 450px !important; } + +.release-branch-button { + margin-top: 10px; +} + +.release-branch-button .button { + margin-right: 0; +} diff --git a/web_src/css/themes/theme-arc-green.css b/web_src/css/themes/theme-arc-green.css index 5e47f8ee3eecf..42cde81802969 100644 --- a/web_src/css/themes/theme-arc-green.css +++ b/web_src/css/themes/theme-arc-green.css @@ -29,33 +29,33 @@ --color-primary-alpha-70: #87ab63b3; --color-primary-alpha-80: #87ab63cc; --color-primary-alpha-90: #87ab63e1; - --color-secondary: #454a57; - --color-secondary-dark-1: #505665; - --color-secondary-dark-2: #5b6273; - --color-secondary-dark-3: #71798e; - --color-secondary-dark-4: #7f8699; - --color-secondary-dark-5: #8c93a4; - --color-secondary-dark-6: #9aa0af; - --color-secondary-dark-7: #a8adba; - --color-secondary-dark-8: #b6bac5; - --color-secondary-dark-9: #c4c7d0; - --color-secondary-dark-10: #d2d4db; - --color-secondary-dark-11: #dfe1e6; - --color-secondary-dark-12: #edeef1; + --color-secondary: #525767; + --color-secondary-dark-1: #5c6374; + --color-secondary-dark-2: #666e81; + --color-secondary-dark-3: #7c8497; + --color-secondary-dark-4: #8990a1; + --color-secondary-dark-5: #959cab; + --color-secondary-dark-6: #a2a8b5; + --color-secondary-dark-7: #afb4c0; + --color-secondary-dark-8: #bcc0ca; + --color-secondary-dark-9: #c9cbd4; + --color-secondary-dark-10: #d6d7de; + --color-secondary-dark-11: #e2e3e8; + --color-secondary-dark-12: #eeeff2; --color-secondary-dark-13: #fbfbfc; - --color-secondary-light-1: #373b46; - --color-secondary-light-2: #292c34; - --color-secondary-light-3: #1c1e23; - --color-secondary-light-4: #0e0f11; - --color-secondary-alpha-10: #454a5719; - --color-secondary-alpha-20: #454a5733; - --color-secondary-alpha-30: #454a574b; - --color-secondary-alpha-40: #454a5766; - --color-secondary-alpha-50: #454a5780; - --color-secondary-alpha-60: #454a5799; - --color-secondary-alpha-70: #454a57b3; - --color-secondary-alpha-80: #454a57cc; - --color-secondary-alpha-90: #454a57e1; + --color-secondary-light-1: #454a57; + --color-secondary-light-2: #383c47; + --color-secondary-light-3: #2c2f37; + --color-secondary-light-4: #1f2226; + --color-secondary-alpha-10: #52576719; + --color-secondary-alpha-20: #52576733; + --color-secondary-alpha-30: #5257674b; + --color-secondary-alpha-40: #52576766; + --color-secondary-alpha-50: #52576780; + --color-secondary-alpha-60: #52576799; + --color-secondary-alpha-70: #525767b3; + --color-secondary-alpha-80: #525767cc; + --color-secondary-alpha-90: #525767e1; /* colors */ --color-red: #cc4848; --color-orange: #cc580c; From 80601691e1e6de0732e073f407749a14e7a06893 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 11:38:42 +0200 Subject: [PATCH 02/29] issue title enhancements --- templates/repo/issue/new.tmpl | 4 ---- templates/repo/issue/view_title.tmpl | 17 +++++++++-------- web_src/css/repository.css | 15 +-------------- web_src/js/features/repo-issue.js | 1 + 4 files changed, 11 insertions(+), 26 deletions(-) diff --git a/templates/repo/issue/new.tmpl b/templates/repo/issue/new.tmpl index 6abff2adde79c..780e874bc6eb5 100644 --- a/templates/repo/issue/new.tmpl +++ b/templates/repo/issue/new.tmpl @@ -2,10 +2,6 @@
    {{template "repo/header" .}}
    -
    - {{template "repo/issue/navbar" .}} -
    -
    {{if .Flash.WarningMsg}} {{/* There's already an importing of alert.tmpl in new_form.tmpl, diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 0ab50b8f98d37..16f2f7dbffca0 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,17 +1,18 @@ -
    -
    - {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} - - {{end}} -

    +
    +
    +

    {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} -
    +

    {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} -
    + + {{end}} + {{.locale.Tr "repo.issues.new"}} + {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} +
    diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 74cdcab901936..5281baf35d772 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -601,10 +601,6 @@ padding-bottom: 0 !important; } -.repository.view.issue .title .issue-title { - margin-bottom: 0.5rem; -} - .repository.view.issue .title .issue-title.edit-active { display: flex; align-items: center; @@ -649,20 +645,11 @@ .repository.view.issue .title .issue-title h1 .ui.input { font-size: 0.5em; - width: 100%; } .repository.view.issue .title .issue-title h1 .ui.input input { font-size: 1.5em; - padding: 6px 1rem; -} - -.repository.view.issue .title .issue-title .edit-button { - float: right; -} - -.repository.view.issue .title .issue-title .edit-buttons { - display: flex; + padding: 0 1rem; } .repository.view.issue .title .issue-title .index { diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index 63fae3a37cb47..a314341f12386 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -572,6 +572,7 @@ export function initRepoIssueTitleEdit() { toggleElem($('#pull-desc')); toggleElem($('#pull-desc-edit')); toggleElem($('.in-edit')); + toggleElem($('.new-issue-button')); $('#issue-title-wrapper').toggleClass('edit-active'); $editInput.trigger('focus'); return false; From e06acbefad375dc54e5d2470beecdf400672cf6c Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 11:56:46 +0200 Subject: [PATCH 03/29] hide 'new issue' button on pull, add margin --- templates/repo/issue/view_title.tmpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 16f2f7dbffca0..130a45ef216b6 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,5 +1,5 @@
    -
    +

    {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} @@ -10,7 +10,9 @@ {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} {{end}} - {{.locale.Tr "repo.issues.new"}} + {{if not .Issue.IsPull}} + {{.locale.Tr "repo.issues.new"}} + {{end}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
    From 3d7d71414e0ad9071c341722ccf125d0cc74667c Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 12:04:21 +0200 Subject: [PATCH 04/29] edit title enhancements --- templates/repo/issue/view_title.tmpl | 4 ++-- web_src/css/repository.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 130a45ef216b6..17cd7ebb506e1 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,9 +1,9 @@
    -

    +

    {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} -
    +

    diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 5281baf35d772..3c5740a64663f 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -640,7 +640,7 @@ font-weight: 300; font-size: 2.3rem; margin: 0; - padding-right: 0.5rem; + padding-right: 0.25rem; } .repository.view.issue .title .issue-title h1 .ui.input { @@ -649,7 +649,7 @@ .repository.view.issue .title .issue-title h1 .ui.input input { font-size: 1.5em; - padding: 0 1rem; + padding: 4px 1rem; } .repository.view.issue .title .issue-title .index { From 970429e55b73d8051149c52dc785e4ff1a03c153 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 12:06:00 +0200 Subject: [PATCH 05/29] move index --- templates/repo/issue/view_title.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 17cd7ebb506e1..a1092cceffda0 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,8 +1,8 @@

    - {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} - #{{.Issue.Index}} + {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} +
    From 50358bb54e82eb0987b0b97a92c560426933ed5d Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 12:35:01 +0200 Subject: [PATCH 06/29] use small buttons on issue/pr, fix focus and select all --- templates/repo/issue/view_title.tmpl | 8 ++++---- web_src/css/repository.css | 2 +- web_src/js/features/repo-issue.js | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index a1092cceffda0..e0bd1c47a2c69 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -8,15 +8,15 @@

    {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} - + {{end}} {{if not .Issue.IsPull}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{end}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
    - - + +
    {{end}}
    diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 3c5740a64663f..3998be606090a 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -649,7 +649,7 @@ .repository.view.issue .title .issue-title h1 .ui.input input { font-size: 1.5em; - padding: 4px 1rem; + padding: 2px .5rem; } .repository.view.issue .title .issue-title .index { diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js index a314341f12386..265eceab59db9 100644 --- a/web_src/js/features/repo-issue.js +++ b/web_src/js/features/repo-issue.js @@ -574,7 +574,8 @@ export function initRepoIssueTitleEdit() { toggleElem($('.in-edit')); toggleElem($('.new-issue-button')); $('#issue-title-wrapper').toggleClass('edit-active'); - $editInput.trigger('focus'); + $editInput[0].focus(); + $editInput[0].select(); return false; }; From 67d2e5e21ef6f4a69980b37c42adde1c9118b8a2 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 12:45:47 +0200 Subject: [PATCH 07/29] remove unneeded margin --- templates/repo/issue/view_title.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index e0bd1c47a2c69..d80d8bd739030 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -3,7 +3,7 @@

    {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} -
    +

    From 66a60ff946dfb2044ef0767328d3a57dabf7a44d Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 12:50:44 +0200 Subject: [PATCH 08/29] remove last button right margin --- templates/repo/issue/view_title.tmpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index d80d8bd739030..1c6d762d9afac 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -8,15 +8,15 @@

    {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} - + {{end}} {{if not .Issue.IsPull}} - {{.locale.Tr "repo.issues.new"}} + {{.locale.Tr "repo.issues.new"}} {{end}} {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}}
    - +
    {{end}}
    From 40fce15519a9eeba91f5bee61f8dde6c1de4ee9e Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 14:19:56 +0200 Subject: [PATCH 09/29] fix integration --- tests/integration/issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index eccf3c3795d9d..f81add72f1b4e 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -143,7 +143,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content htmlDoc = NewHTMLParser(t, resp.Body) val := htmlDoc.doc.Find("#issue-title").Text() - assert.Equal(t, title, val) + assert.contains(t, title, val) val = htmlDoc.doc.Find(".comment .render-content p").First().Text() assert.Equal(t, content, val) From 98f6557fe23574427bb54590f12a1514bda22f9f Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 16:15:00 +0200 Subject: [PATCH 10/29] really fix integration --- tests/integration/issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index f81add72f1b4e..5c43ed6239f79 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -143,7 +143,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content htmlDoc = NewHTMLParser(t, resp.Body) val := htmlDoc.doc.Find("#issue-title").Text() - assert.contains(t, title, val) + assert.Contains(t, title, val) val = htmlDoc.doc.Find(".comment .render-content p").First().Text() assert.Equal(t, content, val) From d1ea7f0dcd2872251ab4dd69672614c5aa51326a Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 16:35:48 +0200 Subject: [PATCH 11/29] style cleanup and mobile improvements --- templates/repo/issue/view_title.tmpl | 20 +++++----- web_src/css/repository.css | 56 ++++++++++++---------------- 2 files changed, 34 insertions(+), 42 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 1c6d762d9afac..954bb33312977 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,5 +1,5 @@ -
    -
    +
    +

    {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}} @@ -7,14 +7,16 @@

    +
    + {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} + + {{end}} + {{if not .Issue.IsPull}} + {{.locale.Tr "repo.issues.new"}} + {{end}} +
    {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} - - {{end}} - {{if not .Issue.IsPull}} - {{.locale.Tr "repo.issues.new"}} - {{end}} - {{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .Repository.IsArchived)}} -
    +
    diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 3998be606090a..1d4415562eb77 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -597,70 +597,60 @@ display: inline-block; } -.repository.view.issue .title { - padding-bottom: 0 !important; -} - -.repository.view.issue .title .issue-title.edit-active { - display: flex; - align-items: center; +.repository.view.issue .issue-title-header { + width: 100%; + padding: 1rem !important; } -.repository.view.issue .title .issue-title.edit-active h1 { +.repository.view.issue .edit-buttons { display: flex; - width: 100%; } @media (max-width: 767px) { - .repository.view.issue .title .issue-title.edit-active { + .repository.view.issue .issue-title { flex-direction: column; } - .repository.view.issue .title .issue-title.edit-active h1 { - margin-right: 0; - margin-bottom: 1rem; - padding-right: 0; - } - .repository.view.issue .title .issue-title.edit-active h1 .ui.input input { - width: calc(100% - 2rem); - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons { - padding-bottom: 1rem; - width: 100%; - } - .repository.view.issue .title .issue-title.edit-active .edit-buttons .button { - width: 100%; - margin-right: 0.5rem; + .repository.view.issue .issue-title-header { + padding: 1rem 0 !important; } - .repository.view.issue .title .issue-title.edit-active .edit-buttons .button:last-child { - margin-right: 0; + .repository.view.issue .edit-buttons { + margin-top: .5rem; } } -.repository.view.issue .title .issue-title h1 { +.repository.view.issue .issue-title { + display: flex; + align-items: center; + flex: 1; + margin-bottom: 1rem; +} + +.repository.view.issue .issue-title h1 { + width: 100%; font-weight: 300; font-size: 2.3rem; margin: 0; padding-right: 0.25rem; } -.repository.view.issue .title .issue-title h1 .ui.input { +.repository.view.issue .issue-title h1 .ui.input { font-size: 0.5em; } -.repository.view.issue .title .issue-title h1 .ui.input input { +.repository.view.issue .issue-title h1 .ui.input input { font-size: 1.5em; padding: 2px .5rem; } -.repository.view.issue .title .issue-title .index { +.repository.view.issue .issue-title .index { color: var(--color-text-light-2); } -.repository.view.issue .title .issue-title .label { +.repository.view.issue .issue-title .label { margin-right: 10px; } -.repository.view.issue .title .issue-title .edit-zone { +.repository.view.issue .issue-title .edit-zone { margin-top: 10px; } From 7b8e70dbba5e2d8412ae6945a7a4dd09545e6e72 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 16:40:22 +0200 Subject: [PATCH 12/29] padding tweak --- web_src/css/repository.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 1d4415562eb77..d4f92444c47e7 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -599,7 +599,7 @@ .repository.view.issue .issue-title-header { width: 100%; - padding: 1rem !important; + padding: .5rem 1rem !important; } .repository.view.issue .edit-buttons { From 79ee750c2c0ccda7230bc820bfb8991658a7c7e9 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 16:41:37 +0200 Subject: [PATCH 13/29] another padding tweak --- web_src/css/repository.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/css/repository.css b/web_src/css/repository.css index d4f92444c47e7..5bf5b6cf5ce43 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -599,7 +599,7 @@ .repository.view.issue .issue-title-header { width: 100%; - padding: .5rem 1rem !important; + padding: 1rem 1rem .5rem !important; } .repository.view.issue .edit-buttons { From eb06789a2242a8e4dc3e323be441df39802af5ac Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 1 May 2023 18:15:25 +0200 Subject: [PATCH 14/29] fix integration check --- tests/integration/issue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/issue_test.go b/tests/integration/issue_test.go index 5c43ed6239f79..7ea7fefb64272 100644 --- a/tests/integration/issue_test.go +++ b/tests/integration/issue_test.go @@ -143,7 +143,7 @@ func testNewIssue(t *testing.T, session *TestSession, user, repo, title, content htmlDoc = NewHTMLParser(t, resp.Body) val := htmlDoc.doc.Find("#issue-title").Text() - assert.Contains(t, title, val) + assert.Contains(t, val, title) val = htmlDoc.doc.Find(".comment .render-content p").First().Text() assert.Equal(t, content, val) From 71014ebf347cce6e70f25c10799bc0c2c040c63b Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 2 May 2023 22:14:44 +0200 Subject: [PATCH 15/29] rename to small-menu-items --- templates/projects/list.tmpl | 2 +- templates/repo/actions/openclose.tmpl | 2 +- templates/repo/issue/milestones.tmpl | 2 +- templates/repo/issue/navbar.tmpl | 2 +- templates/repo/issue/openclose.tmpl | 2 +- templates/repo/projects/list.tmpl | 2 +- templates/repo/sub_menu_release_tag.tmpl | 2 +- templates/user/dashboard/issues.tmpl | 2 +- templates/user/dashboard/milestones.tmpl | 2 +- templates/user/notification/notification_subscriptions.tmpl | 2 +- web_src/css/repository/list-header.css | 4 ++-- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/projects/list.tmpl b/templates/projects/list.tmpl index 1ef0b0be97418..e9e86e5d5d585 100644 --- a/templates/projects/list.tmpl +++ b/templates/projects/list.tmpl @@ -10,7 +10,7 @@ {{end}} {{template "base/alert" .}} -
    +
    {{svg "octicon-project-symlink" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/actions/openclose.tmpl b/templates/repo/actions/openclose.tmpl index 74630187cdc82..6874115a19ff9 100644 --- a/templates/repo/actions/openclose.tmpl +++ b/templates/repo/actions/openclose.tmpl @@ -1,4 +1,4 @@ -
    +
    {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.Tr "actions.runs.open_tab" $.NumOpenActionRuns}} diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index 4a6037bf035b4..d7e782e20d62a 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -13,7 +13,7 @@ {{template "base/alert" .}}
    -
    +
    {{svg "octicon-milestone" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl index da4f17d28ede1..944c6b194a5b2 100644 --- a/templates/repo/issue/navbar.tmpl +++ b/templates/repo/issue/navbar.tmpl @@ -1,4 +1,4 @@ -

    +

    {{.locale.Tr "repo.labels"}} {{.locale.Tr "repo.milestones"}}

    diff --git a/templates/repo/issue/openclose.tmpl b/templates/repo/issue/openclose.tmpl index 6c8529f0ffaf6..a5916ed7934e6 100644 --- a/templates/repo/issue/openclose.tmpl +++ b/templates/repo/issue/openclose.tmpl @@ -1,4 +1,4 @@ -
    +
    {{if .PageIsPullList}} {{svg "octicon-git-pull-request" 16 "gt-mr-3"}} diff --git a/templates/repo/projects/list.tmpl b/templates/repo/projects/list.tmpl index 8df899b6e1474..a5f99cee66a04 100644 --- a/templates/repo/projects/list.tmpl +++ b/templates/repo/projects/list.tmpl @@ -4,7 +4,7 @@
    -
    +
    {{svg "octicon-project" 16 "gt-mr-3"}} {{.locale.PrettyNumber .OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/repo/sub_menu_release_tag.tmpl b/templates/repo/sub_menu_release_tag.tmpl index 279524155671c..c700893ee6702 100644 --- a/templates/repo/sub_menu_release_tag.tmpl +++ b/templates/repo/sub_menu_release_tag.tmpl @@ -2,7 +2,7 @@ {{$canReadCode := $.Permission.CanRead $.UnitTypeCode}} {{if $canReadReleases}} -

    +

    {{.locale.Tr "repo.release.releases"}} {{if $canReadCode}} {{.locale.Tr "repo.release.tags"}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index da7867a225310..8878fe93ca149 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -61,7 +61,7 @@

    -
    +
    {{svg "octicon-issue-opened" 16 "gt-mr-3"}} {{.locale.PrettyNumber .IssueStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/dashboard/milestones.tmpl b/templates/user/dashboard/milestones.tmpl index f9d8ae1eb043a..207b2d70350f4 100644 --- a/templates/user/dashboard/milestones.tmpl +++ b/templates/user/dashboard/milestones.tmpl @@ -35,7 +35,7 @@
    -
    +
    {{svg "octicon-milestone" 16 "gt-mr-3"}} {{.locale.PrettyNumber .MilestoneStats.OpenCount}} {{.locale.Tr "repo.issues.open_title"}} diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl index 6d3262ad6dd97..df69a4dad1af3 100644 --- a/templates/user/notification/notification_subscriptions.tmpl +++ b/templates/user/notification/notification_subscriptions.tmpl @@ -13,7 +13,7 @@ {{if eq .Status 1}}
    -
    +
    {{.locale.Tr "all"}} diff --git a/web_src/css/repository/list-header.css b/web_src/css/repository/list-header.css index 4130383f89d23..24aa36dd89d8a 100644 --- a/web_src/css/repository/list-header.css +++ b/web_src/css/repository/list-header.css @@ -26,11 +26,11 @@ flex: 1; } -.small-pill-buttons { +.small-menu-items { min-height: 35.4px !important; /* match .small.button in height */ } -.small-pill-buttons .item { +.small-menu-items .item { padding-top: 6px !important; padding-bottom: 6px !important; } From 5a4bc2b33cfe0936e4cde29dab168ed56bfe8e2d Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 2 May 2023 22:23:15 +0200 Subject: [PATCH 16/29] move styles and misc tweaks --- templates/repo/issue/view_title.tmpl | 2 +- web_src/css/repository.css | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 954bb33312977..2039c3ef28a6f 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -1,6 +1,6 @@
    -

    +

    {{RenderIssueTitle $.Context .Issue.Title $.RepoLink $.Repository.ComposeMetas | RenderCodeBlock}} #{{.Issue.Index}}
    diff --git a/web_src/css/repository.css b/web_src/css/repository.css index 5b346cb16f20d..a676af7ce42f1 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -596,6 +596,7 @@ padding: 1rem 1rem .5rem !important; } +.repository.view.issue .issue-title-buttons, .repository.view.issue .edit-buttons { display: flex; } @@ -620,11 +621,15 @@ } .repository.view.issue .issue-title h1 { + display: flex; + align-items: center; + flex: 1; width: 100%; font-weight: 300; font-size: 2.3rem; margin: 0; padding-right: 0.25rem; + min-height: 43px; /* avoid layout shift on edit */ } .repository.view.issue .issue-title h1 .ui.input { From f67d75e32bc9d75de829e1f1c11f96a666799b48 Mon Sep 17 00:00:00 2001 From: silverwind Date: Tue, 2 May 2023 22:39:39 +0200 Subject: [PATCH 17/29] label tweaks and more --- templates/repo/issue/view_title.tmpl | 10 +++++----- web_src/css/repository.css | 25 ++++++++++++++++++------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index 2039c3ef28a6f..631c6e46c14ed 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -23,17 +23,17 @@ {{end}}
    {{if .HasMerged}} -
    {{svg "octicon-git-merge" 16}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}
    +
    {{svg "octicon-git-merge" 16 "gt-mr-2"}} {{if eq .Issue.PullRequest.Status 3}}{{.locale.Tr "repo.pulls.manually_merged"}}{{else}}{{.locale.Tr "repo.pulls.merged"}}{{end}}
    {{else if .Issue.IsClosed}} -
    {{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}
    +
    {{if .Issue.IsPull}}{{svg "octicon-git-pull-request"}}{{else}}{{svg "octicon-issue-closed"}}{{end}} {{.locale.Tr "repo.issues.closed_title"}}
    {{else if .Issue.IsPull}} {{if .IsPullWorkInProgress}} -
    {{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}
    +
    {{svg "octicon-git-pull-request-draft"}} {{.locale.Tr "repo.issues.draft_title"}}
    {{else}} -
    {{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}
    +
    {{svg "octicon-git-pull-request"}} {{.locale.Tr "repo.issues.open_title"}}
    {{end}} {{else}} -
    {{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}
    +
    {{svg "octicon-issue-opened"}} {{.locale.Tr "repo.issues.open_title"}}
    {{end}} {{if .Issue.IsPull}} diff --git a/web_src/css/repository.css b/web_src/css/repository.css index a676af7ce42f1..60f27c4a78885 100644 --- a/web_src/css/repository.css +++ b/web_src/css/repository.css @@ -593,7 +593,7 @@ .repository.view.issue .issue-title-header { width: 100%; - padding: 1rem 1rem .5rem !important; + padding-bottom: 4px; } .repository.view.issue .issue-title-buttons, @@ -605,9 +605,6 @@ .repository.view.issue .issue-title { flex-direction: column; } - .repository.view.issue .issue-title-header { - padding: 1rem 0 !important; - } .repository.view.issue .edit-buttons { margin-top: .5rem; } @@ -617,7 +614,7 @@ display: flex; align-items: center; flex: 1; - margin-bottom: 1rem; + margin-bottom: 8px; } .repository.view.issue .issue-title h1 { @@ -626,10 +623,11 @@ flex: 1; width: 100%; font-weight: 300; - font-size: 2.3rem; + font-size: 32px; + line-height: 40px; margin: 0; padding-right: 0.25rem; - min-height: 43px; /* avoid layout shift on edit */ + min-height: 41px; /* avoid layout shift on edit */ } .repository.view.issue .issue-title h1 .ui.input { @@ -653,6 +651,19 @@ margin-top: 10px; } +.issue-state-label { + display: inline-block !important; + font-size: 14px !important; + font-weight: 500 !important; + line-height: 20px !important; + padding: 5px 12px !important; + border-radius : 6px !important; + text-align: center !important; + white-space: nowrap !important; + margin-left: 0 !important; + margin-right: 4px !important; +} + .repository.view.issue .pull-desc code { color: var(--color-primary); } From 81a0c0f6d8a6e80a28a3bd47ba29179d884235bd Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 3 May 2023 10:33:47 +0800 Subject: [PATCH 18/29] fix branch dropdown --- templates/repo/branch_dropdown.tmpl | 9 +++++-- templates/repo/commits.tmpl | 2 +- templates/repo/home.tmpl | 2 +- templates/repo/release/list.tmpl | 10 +++---- web_src/css/repository/release-tag.css | 26 +------------------ .../js/components/RepoBranchTagSelector.vue | 2 +- web_src/js/features/repo-legacy.js | 2 +- 7 files changed, 15 insertions(+), 38 deletions(-) diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl index 0f79474d102ec..984899552dc0b 100644 --- a/templates/repo/branch_dropdown.tmpl +++ b/templates/repo/branch_dropdown.tmpl @@ -1,3 +1,8 @@ +{{/* Attributes: +* root +* ContainerClasses +* (TODO: search "branch_dropdown" in the template direcotry) +*/}} {{$defaultBranch := $.root.BranchName}} {{if and .root.IsViewTag (not .noTag)}} {{$defaultBranch = .root.TagName}} @@ -62,10 +67,10 @@ window.config.pageData.branchDropdownDataList.push(data); -
    +
    {{/* show dummy elements before Vue componment is mounted, this code must match the code in BranchTagSelector.vue */}}
    -