c82bef515e
This will conclude the refactor of 1:1 class replacements to tailwind,
except `gt-hidden`. Commands ran:
```bash
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-0#tw-$1$2-0#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-1#tw-$1$2-0.5#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-2#tw-$1$2-1#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-3#tw-$1$2-2#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-4#tw-$1$2-4#g' {web_src/js,templates,routers,services}/**/*
perl -p -i -e 's#gt-(p|m)([lrtbxy])?-5#tw-$1$2-8#g' {web_src/js,templates,routers,services}/**/*
```
(cherry picked from commit 68ec9b48592fe88765bcc3a73093d43c98b315de)
Conflicts:
routers/web/repo/view.go
templates/base/head_navbar.tmpl
templates/repo/code/recently_pushed_new_branches.tmpl
templates/repo/diff/box.tmpl
templates/repo/diff/compare.tmpl
templates/repo/diff/conversation.tmpl
templates/repo/header.tmpl
templates/repo/issue/filter_list.tmpl
templates/repo/issue/view_content/conversation.tmpl
templates/repo/issue/view_content/sidebar.tmpl
templates/repo/settings/options.tmpl
templates/repo/view_file.tmpl
templates/shared/user/blocked_users.tmpl
templates/status/500.tmpl
web_src/js/components/DashboardRepoList.vue
resolved by prefering Forgejo version and applying the
commands to all files
50 lines
2.3 KiB
Go HTML Template
50 lines
2.3 KiB
Go HTML Template
<div class="divider"></div>
|
|
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </div>
|
|
<div class="instruct-content tw-mt-2 gt-hidden">
|
|
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
|
|
{{$localBranch := .PullRequest.HeadBranch}}
|
|
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
|
|
{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
|
|
{{end}}
|
|
<div class="ui secondary segment">
|
|
{{if eq .PullRequest.Flow 0}}
|
|
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} {{.PullRequest.HeadBranch}}:{{$localBranch}}</div>
|
|
<div>git checkout {{$localBranch}}</div>
|
|
{{else}}
|
|
<div>git fetch -u origin {{.GetGitRefName}}:{{$localBranch}}</div>
|
|
{{end}}
|
|
</div>
|
|
{{if .ShowMergeInstructions}}
|
|
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</div>
|
|
<div class="ui secondary segment">
|
|
<div data-pull-merge-style="merge">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-hidden" data-pull-merge-style="rebase">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-hidden" data-pull-merge-style="rebase-merge">
|
|
<div>git checkout {{$localBranch}}</div>
|
|
<div>git rebase {{.PullRequest.BaseBranch}}</div>
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --no-ff {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-hidden" data-pull-merge-style="squash">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --squash {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-hidden" data-pull-merge-style="manually-merged">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge {{$localBranch}}</div>
|
|
</div>
|
|
<div>git push origin {{.PullRequest.BaseBranch}}</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|