diff --git a/custom/options/locale/locale_en-US.ini b/custom/options/locale/locale_en-US.ini index 18d2027859..bb3f88f810 100644 --- a/custom/options/locale/locale_en-US.ini +++ b/custom/options/locale/locale_en-US.ini @@ -1112,7 +1112,7 @@ fork_article_confirm_yes = Yes, Fork article fork_article_confirm_cancel = Go back fork_article_confirm_body2 = If you'd like to collaborate on the article by making edits, return to the article, apply your changes, and submit. editor.edit_your_article = Edit Your Article -editor.edit_in_your_fork = Edit in Your Fork +editor.edit_in_your_fork = Fork editor.submit_changes = Submit Changes editor.submit_changes_tooltip = Submit your changes as a Change Request to the original article editor.submit_changes_confirm_title = Submit Changes @@ -2014,7 +2014,8 @@ pulls.blocked_by_official_review_requests = "This change request has official re pulls.blocked_by_outdated_branch = "This change request is blocked because it's outdated." pulls.blocked_by_changed_protected_files_1= "This change request is blocked because it changes a protected file:" pulls.blocked_by_changed_protected_files_n= "This change request is blocked because it changes protected files:" -pulls.can_auto_merge_desc = This change request can be merged automatically. +pulls.can_auto_merge_desc = This change request has no conflicts with the latest article. +pulls.can_auto_merge_desc_detail = Merging can be performed automatically. pulls.cannot_auto_merge_desc = This change request cannot be merged automatically due to conflicts. pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. pulls.num_conflicting_files_1 = "%d conflicting file" diff --git a/custom/public/assets/css/base.custom.css b/custom/public/assets/css/base.custom.css index e12a88c48f..387a292ded 100644 --- a/custom/public/assets/css/base.custom.css +++ b/custom/public/assets/css/base.custom.css @@ -23,4 +23,52 @@ .ui.form .field > .ui.input > input, .ui.form .field > .ui.input > textarea { border-radius: var(--border-radius); +} + +.circle { + border-radius: 50% !important; + overflow: hidden; + width: 2rem; + height: 2rem; + display: flex; + align-items: center; + justify-content: center; +} + +.circle.small { + width: 1.5rem; + height: 1.5rem; +} + +.circle svg { + width: 18px; + height: 18px; +} + +.circle.small svg { + scale: .8; +} + +.circle.green-light-1{ + color: var(--color-white); + background-color: var(--color-green-light-1); + border: none !important; +} + +.circle.red{ + color: var(--color-white); + background-color: var(--color-red); + border: none !important; +} + +.circle.yellow{ + color: var(--color-white); + background-color: var(--color-yellow); + border: none !important; +} + +.circle.grey{ + color: var(--color-white); + background-color: var(--color-grey); + border: none !important; } \ No newline at end of file diff --git a/custom/public/assets/css/colors.custom.css b/custom/public/assets/css/colors.custom.css index 6246587e97..54726ca15f 100644 --- a/custom/public/assets/css/colors.custom.css +++ b/custom/public/assets/css/colors.custom.css @@ -31,6 +31,7 @@ gitea-theme-meta-info { /* Green colors */ --color-green: #1F883D; --color-green-light: #2DA44E; + --color-green-light-1: #1DD781; --color-green-dark-1: #1A7F37; --color-green-dark-2: #116329; @@ -85,5 +86,8 @@ gitea-theme-meta-info { /* Tab colors */ --color-tab-inactive: #969aa5; --color-tab-active-text: #555; + + --color-red: #CF222E; + --color-yellow: #EBB400; } diff --git a/custom/public/assets/css/repo.custom.css b/custom/public/assets/css/repo.custom.css index 9f2b994fd7..8173aae338 100644 --- a/custom/public/assets/css/repo.custom.css +++ b/custom/public/assets/css/repo.custom.css @@ -21,6 +21,25 @@ padding: 1rem; } +/* Merge section border colors */ +.merge-section.border-red { border-color: var(--color-red) !important; } +.merge-section.border-purple { border-color: var(--color-purple) !important; } +.merge-section.border-grey { border-color: var(--color-grey) !important; } +.merge-section.border-yellow { border-color: var(--color-yellow) !important; } +.merge-section.border-green { border-color: var(--color-green) !important; } +.merge-section.border-green-light-1 { border-color: var(--color-green-light-1) !important; } + +/* Smaller timeline avatars */ +.timeline-avatar { + width: 28px !important; + height: 28px !important; +} + +.timeline-avatar img { + width: 28px !important; + height: 28px !important; +} + @media (max-width: 767.98px) { .repository.view.issue .comment-list .comment .content .form .button:not(:last-child) { margin-bottom: 0 !important; @@ -193,6 +212,12 @@ overflow: hidden; } +.repository .comment-container .diff-file-box { + border-radius: 0 !important; + border: none !important; + border-bottom: 1px solid var(--color-border) !important; +} + /* Remove inner borders to prevent double-border */ .diff-file-box .ui.attached.table, .diff-file-box .ui.attached.header, diff --git a/custom/templates/repo/commits_list.tmpl b/custom/templates/repo/commits_list.tmpl new file mode 100644 index 0000000000..f7e6f703da --- /dev/null +++ b/custom/templates/repo/commits_list.tmpl @@ -0,0 +1,92 @@ +
+ + + + + + + + + + + + {{$commitRepoLink := $.RepoLink}}{{if $.CommitRepoLink}}{{$commitRepoLink = $.CommitRepoLink}}{{end}} + {{range .Commits}} + + + + + {{if .Committer}} + + {{else}} + + {{end}} + + + {{end}} + +
{{ctx.Locale.Tr "repo.commits.author"}}{{StringUtils.ToUpper $.Repository.ObjectFormatName}}{{ctx.Locale.Tr "repo.commits.message"}}{{ctx.Locale.Tr "repo.commits.date"}}
+
+ {{$userName := .Author.Name}} + {{if .User}} + {{if and .User.FullName DefaultShowFullName}} + {{$userName = .User.FullName}} + {{end}} + {{ctx.AvatarUtils.Avatar .User 28 "tw-mr-2"}}{{$userName}} + {{else}} + {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 28 "tw-mr-2"}} + {{$userName}} + {{end}} +
+ 		+ {{$commitBaseLink := ""}} + {{if $.PageIsWiki}} + {{$commitBaseLink = printf "%s/wiki/commit" $commitRepoLink}} + {{else if $.PageIsPullCommits}} + {{$commitBaseLink = printf "%s/pulls/%d/commits" $commitRepoLink $.Issue.Index}} + {{else if $.Reponame}} + {{$commitBaseLink = printf "%s/commit" $commitRepoLink}} + {{end}} + {{template "repo/commit_sign_badge" dict "Commit" . "CommitBaseLink" $commitBaseLink "CommitSignVerification" .Verification}} + + + {{if $.PageIsWiki}} + {{.Summary | ctx.RenderUtils.RenderEmoji}} + {{else if $.PageIsPullCommits}} + {{$commitLink:= printf "%s/pulls/%d/commits/%s" $commitRepoLink $.Issue.Index (PathEscape .ID.String)}} + {{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.Repository}} + {{else}} + {{$commitLink:= printf "%s/commit/%s" $commitRepoLink (PathEscape .ID.String)}} + {{ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $.Repository}} + {{end}} + + {{if IsMultilineCommitMessage .Message}} + + {{end}} + {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}} + {{if IsMultilineCommitMessage .Message}} + 
{{ctx.RenderUtils.RenderCommitBody .Message $.Repository}}
+ {{end}} + {{if $.CommitsTagsMap}} + {{range (index $.CommitsTagsMap .ID.String)}} + {{- template "repo/tag/name" dict "AdditionalClasses" "tw-py-0" "RepoLink" $.Repository.Link "TagName" .TagName "IsRelease" (not .IsTag) -}} + {{end}} + {{end}} + 		{{DateUtils.TimeSince .Committer.When}}{{DateUtils.TimeSince .Author.When}} + + {{/* at the moment, wiki doesn't support these "view" links like "view at history point" */}} + {{if not $.PageIsWiki}} + {{/* view single file diff */}} + {{if $.FileTreePath}} + {{svg "octicon-file-diff"}} + {{end}} + + {{/* view at history point */}} + {{$viewCommitLink := printf "%s/src/commit/%s" $commitRepoLink (PathEscape .ID.String)}} + {{if $.FileTreePath}}{{$viewCommitLink = printf "%s/%s" $viewCommitLink (PathEscapeSegments $.FileTreePath)}}{{end}} + {{svg "octicon-file-code"}} + {{end}} +
+
diff --git a/custom/templates/repo/commits_list_small.tmpl b/custom/templates/repo/commits_list_small.tmpl new file mode 100644 index 0000000000..465ff2812b --- /dev/null +++ b/custom/templates/repo/commits_list_small.tmpl @@ -0,0 +1,55 @@ +{{$index := 0}} +
+{{range .comment.Commits}} + {{$tag := printf "%s-%d" $.comment.HashTag $index}} + {{$index = Eval $index "+" 1}} +
{{/*singular-commit*/}} + {{svg "octicon-git-commit"}} + {{if .User}} + {{ctx.AvatarUtils.Avatar .User 20}} + {{else}} + {{ctx.AvatarUtils.AvatarByEmail .Author.Email .Author.Name 20}} + {{end}} + + {{$repoData := $.Repository}} + {{$repoLink := ""}} + {{if $.Repository}} + {{$repoLink = $.Repository.Link}} + {{end}} + {{if $.comment.Issue.PullRequest}} + {{if $.comment.Issue.PullRequest.BaseRepo}} + {{$repoData = $.comment.Issue.PullRequest.BaseRepo}} + {{$repoLink = $.comment.Issue.PullRequest.BaseRepo.Link}} + {{end}} + {{end}} + + {{$commitBaseLink := ""}} + {{$commitLink := ""}} + {{if $.comment.Issue.IsPull}} + {{$commitBaseLink = printf "%s/pulls/%d/commits" $repoLink $.comment.Issue.Index}} + {{$commitLink = printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} + {{else}} + {{$commitBaseLink = printf "%s/commit" $repoLink}} + {{$commitLink = printf "%s/%s" $commitBaseLink (PathEscape .ID.String)}} + {{end}} + + + {{- ctx.RenderUtils.RenderCommitMessageLinkSubject .Message $commitLink $repoData -}} + + + {{if IsMultilineCommitMessage .Message}} + + {{end}} + + + {{template "repo/commit_statuses" dict "Status" .Status "Statuses" .Statuses}} + {{template "repo/commit_sign_badge" dict "Commit" . "CommitBaseLink" $commitBaseLink "CommitSignVerification" .Verification}} + +
+ {{if IsMultilineCommitMessage .Message}} + 
+		{{- ctx.RenderUtils.RenderCommitBody .Message $repoData -}}
+
+ {{end}} +{{end}} +
diff --git a/custom/templates/repo/issue/view_content/comments.tmpl b/custom/templates/repo/issue/view_content/comments.tmpl index 6abe96f96e..6bf28969e9 100644 --- a/custom/templates/repo/issue/view_content/comments.tmpl +++ b/custom/templates/repo/issue/view_content/comments.tmpl @@ -229,19 +229,7 @@ {{ctx.Locale.Tr "repo.issues.change_title_at" (.OldTitle|ctx.RenderUtils.RenderEmoji) (.NewTitle|ctx.RenderUtils.RenderEmoji) $createdStr}} - {{else if eq .Type 11}} - - + {{else if eq .Type 12}}
{{svg "octicon-clock"}} @@ -552,8 +540,7 @@ {{continue}} {{end}}
- {{svg "octicon-repo-push"}} - + {{template "shared/user/authorlink" .Poster}} {{if .IsForcePush}} {{ctx.Locale.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr}} diff --git a/custom/templates/repo/issue/view_content/pull_merge_box.tmpl b/custom/templates/repo/issue/view_content/pull_merge_box.tmpl index 5925eb833b..5068994164 100644 --- a/custom/templates/repo/issue/view_content/pull_merge_box.tmpl +++ b/custom/templates/repo/issue/view_content/pull_merge_box.tmpl @@ -1,6 +1,24 @@ {{if and .Issue.PullRequest.HasMerged (not .IsPullBranchDeletable)}} {{/* Then the merge box will not be displayed because this page already contains enough information */}} {{else}} +{{$mergeColor := "red"}} +{{- if .Issue.PullRequest.HasMerged}}{{$mergeColor = "purple"}} +{{- else if .Issue.IsClosed}}{{$mergeColor = "grey"}} +{{- else if .IsPullWorkInProgress}}{{$mergeColor = "grey"}} +{{- else if .IsFilesConflicted}}{{$mergeColor = "grey"}} +{{- else if .IsPullRequestBroken}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByApprovals}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByRejection}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByOfficialReviewRequests}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByOutdatedBranch}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByChangedProtectedFiles}}{{$mergeColor = "red"}} +{{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}{{$mergeColor = "red"}} +{{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}{{$mergeColor = "yellow"}} +{{- else if and .AllowMerge .RequireSigned (not .WillSign)}}{{$mergeColor = "red"}} +{{- else if .Issue.PullRequest.IsChecking}}{{$mergeColor = "yellow"}} +{{- else if .Issue.PullRequest.IsEmpty}}{{$mergeColor = "grey"}} +{{- else if .Issue.PullRequest.CanAutoMerge}}{{$mergeColor = "green-light-1"}} +{{- end}}
-
{{svg "octicon-git-merge" 40}}
+
{{svg "octicon-git-merge" 40}}
{{if .LatestCommitStatus}}
@@ -38,7 +40,7 @@
{{end}} {{$showGeneralMergeForm := false}} -
+
{{if .Issue.PullRequest.HasMerged}} {{if .IsPullBranchDeletable}}
@@ -198,8 +200,15 @@
{{else}}
- {{svg "octicon-check"}} - {{ctx.Locale.Tr "repo.pulls.can_auto_merge_desc"}} +
+ {{svg "octicon-check"}} +
+
+ {{ctx.Locale.Tr "repo.pulls.can_auto_merge_desc"}} +
+ {{ctx.Locale.Tr "repo.pulls.can_auto_merge_desc_detail"}} +
+
{{end}} {{if .WillSign}} @@ -207,11 +216,7 @@ {{svg "octicon-lock" 16 "text green"}} {{ctx.Locale.Tr "repo.signing.will_sign" .SigningKeyMergeDisplay}}
- {{else if .IsSigned}} -
- {{svg "octicon-unlock"}} - {{ctx.Locale.Tr (printf "repo.signing.wont_sign.%s" .WontSignReason)}} -
+ {{end}} {{end}} @@ -233,7 +238,7 @@ {{$createdPRMergeStr := DateUtils.TimeSince .PendingPullRequestMerge.CreatedUnix}} {{$hasPendingPullRequestMergeTip = ctx.Locale.Tr "repo.pulls.auto_merge_has_pending_schedule" .PendingPullRequestMerge.Doer.Name $createdPRMergeStr}} {{end}} -
+
{{.Issue.PullRequest.HeadRepo.OwnerName}} / @@ -111,33 +112,7 @@ {{end}} -
-
- {{ctx.Locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}} -
-
- {{svg "octicon-arrow-right"}} -
-
- {{ctx.Locale.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}} - {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
-
-
- {{svg "octicon-filter" 16}} - -
- -
-
+ {{end}} {{else}} diff --git a/custom/templates/shared/repo/article.tmpl b/custom/templates/shared/repo/article.tmpl index c5c2e66e50..834401bf9f 100644 --- a/custom/templates/shared/repo/article.tmpl +++ b/custom/templates/shared/repo/article.tmpl @@ -84,13 +84,11 @@ {{else if .HasExistingFork}} {{/* User has an existing fork of this repo - show both options */}} - {{svg "octicon-repo-forked" 16 "tw-mr-1"}} {{ctx.Locale.Tr "repo.editor.edit_in_your_fork"}} {{if .CanSubmitChangeRequest}} {{end}} diff --git a/routers/web/repo/pull_review_test.go b/routers/web/repo/pull_review_test.go index 42223c1d9c..cd13d9e34d 100644 --- a/routers/web/repo/pull_review_test.go +++ b/routers/web/repo/pull_review_test.go @@ -65,12 +65,12 @@ func TestRenderConversation(t *testing.T) { run("timeline with outdated", func(t *testing.T, ctx *context.Context, resp *httptest.ResponseRecorder) { ctx.Data["ShowOutdatedComments"] = true renderConversation(ctx, preparedComment, "timeline") - assert.Contains(t, resp.Body.String(), `
-
-
- {{$comment.TreePath}} - {{if $invalid}} - - {{ctx.Locale.Tr "repo.issues.review.outdated"}} - - {{end}} -
-
- {{if or $invalid $resolved}} - -
+
+ {{template "repo/issue/view_content/show_role" dict "ShowRole" $c.ShowRole}} + {{if not $.Repository.IsArchived}} + {{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink $c.ID)}} + {{template "repo/issue/view_content/context_menu" dict "item" $c "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID $c.PosterID))}} {{end}} - - {{end}} -
-
- {{$diff := (CommentMustAsDiff ctx $comment)}} - {{if $diff}} - {{$file := (index $diff.Files 0)}} -
-
-
- - - {{template "repo/diff/section_unified" dict "file" $file "root" $}} - -
-
- {{end}} -
-
- {{range .comments}} - {{$createdSubStr:= DateUtils.TimeSince .CreatedUnix}} -
-
-
-
- {{if not .OriginalAuthor}} - - {{ctx.AvatarUtils.Avatar .Poster 20}} - - {{end}} - - {{if .OriginalAuthor}} - - {{svg (MigrationIcon $.Repository.GetOriginalURLHostname)}} - {{.OriginalAuthor}} - - {{if $.Repository.OriginalURL}} - ({{ctx.Locale.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname}}) - {{end}} - {{else}} - {{template "shared/user/authorlink" .Poster}} - {{end}} - {{ctx.Locale.Tr "repo.issues.commented_at" .HashTag $createdSubStr}} - -
-
- {{template "repo/issue/view_content/show_role" dict "ShowRole" .ShowRole}} - {{if not $.Repository.IsArchived}} - {{template "repo/issue/view_content/add_reaction" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID)}} - {{template "repo/issue/view_content/context_menu" dict "item" . "delete" true "issue" true "diff" true "IsCommentPoster" (and $.IsSigned (eq $.SignedUserID .PosterID))}} - {{end}} -
-
-
-
- {{if .RenderedContent}} - {{.RenderedContent}} - {{else}} - {{ctx.Locale.Tr "repo.issues.no_content"}} - {{end}} -
-
{{.Content}}
-
- {{if .Attachments}} - {{template "repo/issue/view_content/attachments" dict "Attachments" .Attachments "RenderedContent" .RenderedContent}} - {{end}} + {{if and (eq $i 0) $diff}} + {{$file := (index $diff.Files 0)}} +
+
+
+ + + {{template "repo/diff/section_unified" dict "file" $file "root" $}} + +
- {{$reactions := .Reactions.GroupByType}} - {{if $reactions}} - {{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink .ID) "Reactions" $reactions}} - {{end}}
{{end}} -
-
-
- {{if $resolved}} -
- {{svg "octicon-check" 16 "tw-mr-1"}} - {{$resolveDoer.Name}} {{ctx.Locale.Tr "repo.issues.review.resolved_by"}} -
- {{end}} -
-
- {{if and $.CanMarkConversation $hasReview (not $isReviewPending)}} - - {{end}} - {{if and $.SignedUserID (not $.Repository.IsArchived)}} - +
+ +
+ {{if $c.RenderedContent}} + {{$c.RenderedContent}} + {{else}} + {{ctx.Locale.Tr "repo.issues.no_content"}} + {{end}} +
+
{{$c.Content}}
+
+ {{if $c.Attachments}} + {{template "repo/issue/view_content/attachments" dict "Attachments" $c.Attachments "RenderedContent" $c.RenderedContent}} {{end}}
+ {{$reactions := $c.Reactions.GroupByType}} + {{if $reactions}} + {{template "repo/issue/view_content/reactions" dict "ActionURL" (printf "%s/comments/%d/reactions" $.RepoLink $c.ID) "Reactions" $reactions}} + {{end}}
- {{template "repo/diff/comment_form_datahandler" dict "hidden" true "reply" $comment.ReviewID "root" $ "comment" $comment}}
-
+ {{end}} {{else}} {{template "repo/diff/conversation_outdated"}} {{end}} diff --git a/templates/repo/issue/view_content/pull_merge_box.tmpl b/templates/repo/issue/view_content/pull_merge_box.tmpl index b0ac24c9f6..1f029a5958 100644 --- a/templates/repo/issue/view_content/pull_merge_box.tmpl +++ b/templates/repo/issue/view_content/pull_merge_box.tmpl @@ -1,6 +1,24 @@ {{if and .Issue.PullRequest.HasMerged (not .IsPullBranchDeletable)}} {{/* Then the merge box will not be displayed because this page already contains enough information */}} {{else}} +{{$mergeColor := "red"}} +{{- if .Issue.PullRequest.HasMerged}}{{$mergeColor = "purple"}} +{{- else if .Issue.IsClosed}}{{$mergeColor = "grey"}} +{{- else if .IsPullWorkInProgress}}{{$mergeColor = "grey"}} +{{- else if .IsFilesConflicted}}{{$mergeColor = "grey"}} +{{- else if .IsPullRequestBroken}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByApprovals}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByRejection}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByOfficialReviewRequests}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByOutdatedBranch}}{{$mergeColor = "red"}} +{{- else if .IsBlockedByChangedProtectedFiles}}{{$mergeColor = "red"}} +{{- else if and .EnableStatusCheck (or .RequiredStatusCheckState.IsFailure .RequiredStatusCheckState.IsError)}}{{$mergeColor = "red"}} +{{- else if and .EnableStatusCheck (or (not $.LatestCommitStatus) .RequiredStatusCheckState.IsPending .RequiredStatusCheckState.IsWarning)}}{{$mergeColor = "yellow"}} +{{- else if and .AllowMerge .RequireSigned (not .WillSign)}}{{$mergeColor = "red"}} +{{- else if .Issue.PullRequest.IsChecking}}{{$mergeColor = "yellow"}} +{{- else if .Issue.PullRequest.IsEmpty}}{{$mergeColor = "grey"}} +{{- else if .Issue.PullRequest.CanAutoMerge}}{{$mergeColor = "green-light-1"}} +{{- end}}
-
{{svg "octicon-git-merge" 40}}
+
{{svg "octicon-git-merge" 40}}
{{if .LatestCommitStatus}}
@@ -38,7 +40,7 @@
{{end}} {{$showGeneralMergeForm := false}} -
+
{{if .Issue.PullRequest.HasMerged}} {{if .IsPullBranchDeletable}}
diff --git a/web_src/css/repo.css b/web_src/css/repo.css index c65049ffd9..28de58e763 100644 --- a/web_src/css/repo.css +++ b/web_src/css/repo.css @@ -253,7 +253,11 @@ td .commit-summary { font-size: 14px; margin-bottom: 2.5rem; margin-top: 2rem; - + background: transparent; + border: none; + padding: 0; + cursor: pointer; + font-family: inherit; } .pr-back-link:hover { @@ -427,7 +431,7 @@ td .commit-summary { .repository.view.issue .comment-list .timeline { position: relative; display: block; - margin-left: 40px; + margin-left: 26px; padding-left: 16px; } @@ -466,7 +470,9 @@ td .commit-summary { .repository.view.issue .comment-list .timeline-item .timeline-avatar { position: absolute; - left: -68px; + left: -58px; + border: 1px solid var(--color-secondary); + border-radius: var(--border-radius); } /* Don't show the mobile oriented avatar ".inline-timeline-avatar" on desktop. Desktop uses the avatar with class ".timeline-avatar" */ diff --git a/web_src/js/components/PullRequestMergeForm.vue b/web_src/js/components/PullRequestMergeForm.vue index dc5a4f4fb3..aabdfb9eba 100644 --- a/web_src/js/components/PullRequestMergeForm.vue +++ b/web_src/js/components/PullRequestMergeForm.vue @@ -1,15 +1,14 @@