diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index 93ac046612..72cdfbc40f 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -1533,7 +1533,7 @@ "repo.issues.comment_pull_merged_at": "merged commit %[1]s into %[2]s %[3]s", "repo.issues.comment_manually_pull_merged_at": "manually merged commit %[1]s into %[2]s %[3]s", "repo.issues.close_comment_issue": "Close with Comment", - "repo.issues.reopen_issue": "Reopen", + "repo.issues.reopen_issue": "Reopen Issue", "repo.issues.reopen_comment_issue": "Reopen with Comment", "repo.issues.create_comment": "Comment", "repo.issues.comment.blocked_user": "Cannot create or edit comment because you are blocked by the poster or repository owner.", @@ -1877,6 +1877,7 @@ "repo.pulls.update_not_allowed": "You are not allowed to update branch", "repo.pulls.outdated_with_base_branch": "This branch is out-of-date with the base branch", "repo.pulls.close": "Close Pull Request", + "repo.pulls.reopen": "Reopen Pull Request", "repo.pulls.closed_at": "closed this pull request %[2]s", "repo.pulls.reopened_at": "reopened this pull request %[2]s", "repo.pulls.cmd_instruction_hint": "View command line instructions", diff --git a/templates/repo/graph.tmpl b/templates/repo/graph.tmpl index cd115f95dc..33ff19f3b5 100644 --- a/templates/repo/graph.tmpl +++ b/templates/repo/graph.tmpl @@ -40,8 +40,8 @@ {{end}} - - + +
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index b7fec4a07d..e1fa13e5ec 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -84,19 +84,24 @@
{{if and (or .HasIssuesOrPullsWritePermission .IsIssuePoster) (not .DisableStatusChange)}} + {{$btnIconColor := ""}}{{$btnIcon := ""}}{{$btnTextNoComment := ""}}{{$btnTextWithComment := ""}}{{$btnValue := ""}} {{if .Issue.IsClosed}} - + {{$btnValue = "reopen"}} + {{$btnIconColor = "tw-text-green"}} + {{$btnIcon = Iif .Issue.IsPull "octicon-git-pull-request" "octicon-issue-reopened"}} + {{$btnTextNoComment = ctx.Locale.Tr (Iif .Issue.IsPull "repo.pulls.reopen" "repo.issues.reopen_issue")}} + {{$btnTextWithComment = ctx.Locale.Tr "repo.issues.reopen_comment_issue"}}{{/* general: Reopen with Comment */}} {{else}} - {{$closeTranslationKey := "repo.issues.close"}} - {{if .Issue.IsPull}} - {{$closeTranslationKey = "repo.pulls.close"}} - {{end}} - + {{$btnValue = "close"}} + {{$btnIconColor = "tw-text-red"}} + {{$btnIcon = Iif .Issue.IsPull "octicon-git-pull-request-closed" "octicon-issue-closed"}} + {{$btnTextNoComment = ctx.Locale.Tr (Iif .Issue.IsPull "repo.pulls.close" "repo.issues.close")}} + {{$btnTextWithComment = ctx.Locale.Tr "repo.issues.close_comment_issue"}}{{/* general: Close with Comment */}} {{end}} + {{end}}
diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl index cae00b966b..b1cec48e1b 100644 --- a/templates/user/settings/applications.tmpl +++ b/templates/user/settings/applications.tmpl @@ -41,7 +41,7 @@
diff --git a/templates/user/settings/applications_oauth2_list.tmpl b/templates/user/settings/applications_oauth2_list.tmpl index e1439a9369..f1cc09460e 100644 --- a/templates/user/settings/applications_oauth2_list.tmpl +++ b/templates/user/settings/applications_oauth2_list.tmpl @@ -21,12 +21,12 @@ {{ctx.Locale.Tr "locked"}} {{else}} - {{svg "octicon-pencil" 16 "tw-mr-1"}} + {{svg "octicon-pencil"}} {{ctx.Locale.Tr "settings.oauth2_application_edit"}} {{end}} diff --git a/web_src/css/base.css b/web_src/css/base.css index cdd1e28d4f..699043b45a 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -1095,7 +1095,6 @@ table th[data-sortt-desc] .svg { } .btn, -.ui.ui.button, .ui.ui.dropdown, .flex-text-inline, .flex-text-inline > a, diff --git a/web_src/css/modules/button.css b/web_src/css/modules/button.css index 8e3309474b..9458f11e53 100644 --- a/web_src/css/modules/button.css +++ b/web_src/css/modules/button.css @@ -1,6 +1,8 @@ .ui.button { cursor: pointer; display: inline-flex; + align-items: center; + min-width: 0; outline: none; font-family: var(--fonts-regular); margin: 0 0.25em 0 0; @@ -100,11 +102,13 @@ /* reference sizes (not exactly at the moment): normal: padding-x=21, height=38 ; compact: padding-x=15, height=32 */ .ui.button { /* stylelint-disable-line no-duplicate-selectors */ + gap: var(--gap-block); min-height: 38px; padding: 0.57em /* around 8px */ 1.43em /* around 20px */; } .ui.compact.buttons .button, .ui.compact.button { + gap: var(--gap-inline); padding: 0.42em /* around 8px */ 1.07em /* around 15px */; min-height: 32px; } @@ -118,6 +122,7 @@ .ui.mini.buttons .dropdown .menu > .item, .ui.mini.buttons .button, .ui.ui.ui.ui.mini.button { + gap: var(--gap-inline); font-size: 11px; min-height: 30px; } @@ -130,6 +135,7 @@ .ui.tiny.buttons .dropdown .menu > .item, .ui.tiny.buttons .button, .ui.ui.ui.ui.tiny.button { + gap: var(--gap-inline); font-size: 12px; min-height: 32px; } diff --git a/web_src/js/features/repo-issue.ts b/web_src/js/features/repo-issue.ts index 4b04ed4ccf..8da28f7f3a 100644 --- a/web_src/js/features/repo-issue.ts +++ b/web_src/js/features/repo-issue.ts @@ -513,7 +513,8 @@ async function initSingleCommentEditor(commentForm: HTMLFormElement) { const syncUiState = () => { const editorText = editor.value().trim(), isUploading = editor.isUploading(); if (statusButton) { - statusButton.textContent = statusButton.getAttribute(editorText ? 'data-status-and-comment' : 'data-status'); + const statusText = statusButton.getAttribute(editorText ? 'data-status-and-comment' : 'data-status'); + statusButton.querySelector('.status-button-text')!.textContent = statusText; statusButton.disabled = isUploading; } if (commentButton) {