diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ff54bcd3b..58fd7d8f5 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -86,6 +86,9 @@ write = Write preview = Preview loading = Loading… +step1 = Step 1: +step2 = Step 2: + error404 = The page you are trying to reach either does not exist or you are not authorized to view it. [error] @@ -1296,6 +1299,10 @@ pulls.update_not_allowed = You are not allowed to update branch pulls.outdated_with_base_branch = This branch is out-of-date with the base branch pulls.closed_at = `closed this pull request %[2]s` pulls.reopened_at = `reopened this pull request %[2]s` +pulls.merge_instruction_hint = `You can also view command line instructions.` + +pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes. +pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea. milestones.new = New Milestone milestones.open_tab = %d Open diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl index c8fb50d86..facb379a1 100644 --- a/templates/repo/issue/view_content/pull.tmpl +++ b/templates/repo/issue/view_content/pull.tmpl @@ -323,43 +323,60 @@ {{end}} -
- - {{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}} -
- {{svg "octicon-triangle-down" 14 "dropdown icon"}} -
- {{if $prUnit.PullRequestsConfig.AllowMerge}} -
{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
- {{end}} - {{if $prUnit.PullRequestsConfig.AllowRebase}} -
{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
- {{end}} - {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}} -
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
- {{end}} - {{if $prUnit.PullRequestsConfig.AllowSquash}} -
{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
- {{end}} +
+
+ + {{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}} +
+ {{svg "octicon-triangle-down" 14 "dropdown icon"}} +
+ {{if $prUnit.PullRequestsConfig.AllowMerge}} +
{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
+ {{end}} + {{if $prUnit.PullRequestsConfig.AllowRebase}} +
{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
+ {{end}} + {{if $prUnit.PullRequestsConfig.AllowRebaseMerge}} +
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
+ {{end}} + {{if $prUnit.PullRequestsConfig.AllowSquash}} +
{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
+ {{end}} +
-
- {{end}} + {{end}} +
+
+
{{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}}
+ {{else}}
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index e790dad83..49ea869bf 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -33,7 +33,7 @@ {{.i18n.Tr "new_repo"}} -
+
{{svg "octicon-search" 16}} diff --git a/web_src/js/index.js b/web_src/js/index.js index 496495a1c..0dc0a9273 100644 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -1201,6 +1201,12 @@ async function initRepository() { } } +function initPullRequestMergeInstruction() { + $('.show-instruction').on('click', () => { + $('.instruct').toggle(); + }); +} + function initPullRequestReview() { if (window.location.hash && window.location.hash.startsWith('#issuecomment-')) { const commentDiv = $(window.location.hash); @@ -2526,6 +2532,7 @@ $(document).ready(async () => { initContextPopups(); initTableSort(); initNotificationsTable(); + initPullRequestMergeInstruction(); const routes = { 'div.user.settings': initUserSettings, diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 2cecd59c9..517075db8 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -99,7 +99,8 @@ --color-markdown-code-block: #00000008; --color-button: #ffffff; --color-code-bg: #ffffff; - --color-shadow: #00000024; + --color-markdown-code-block: #00000010; + --color-secondary-bg: #f4f4f4; } :root:lang(ja) { @@ -1691,6 +1692,11 @@ a.ui.basic.label:hover { border-color: var(--color-secondary); } +.ui.secondary.segment { + background: var(--color-secondary-bg); + color: var(--color-text-light); +} + .ui.attached.header { position: relative; background: var(--color-box-header); diff --git a/web_src/less/helpers.less b/web_src/less/helpers.less index c611076f4..04c1b6567 100644 --- a/web_src/less/helpers.less +++ b/web_src/less/helpers.less @@ -1,5 +1,7 @@ .df { display: flex !important; } +.di { display: inline !important; } .dif { display: inline-flex !important; } +.dib { display: inline-block !important; } .ac { align-items: center !important; } .tc { text-align: center !important; } .jc { justify-content: center !important; } diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 526fa5873..7002d18c6 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -95,6 +95,7 @@ --color-button: #353846; --color-code-bg: #2a2e3a; --color-shadow: #00000060; + --color-secondary-bg: #2a2e3a; } /* LineTableTD */ @@ -827,10 +828,6 @@ td.blob-hunk { color: #dbdbdb; } -.ui.secondary.segment { - background: #353945; -} - .ui.attached.info.message, .ui.info.message { box-shadow: 0 0 0 1px #4b5e71 inset, 0 0 0 0 transparent;