Skip to content

Commit 3cc6f2a

Browse files
committed
fix
1 parent e1e88f9 commit 3cc6f2a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

templates/repo/issue/view_content/pull.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@
360360
{{if and $.StillCanManualMerge (not $showGeneralMergeForm)}}
361361
<div class="divider"></div>
362362
<div class="ui form">
363-
<form action="{{.Link}}/merge" method="post">
363+
<form class="form-fetch-action" action="{{.Link}}/merge" method="post">
364364
{{.CsrfTokenHtml}}
365365
<div class="field">
366366
<input type="text" name="merge_commit_id" placeholder="{{ctx.Locale.Tr "repo.pulls.merge_commit_id"}}">

templates/status/404.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{{template "base/head" .}}
2-
<div role="main" aria-label="{{.Title}}" class="page-content ui container center gt-w-screen {{if .IsRepo}}repository{{end}}">
2+
<div role="main" aria-label="{{.Title}}" class="page-content {{if .IsRepo}}repository{{end}}">
33
{{if .IsRepo}}{{template "repo/header" .}}{{end}}
44
<div class="ui container center">
5-
<p style="margin-top: 100px"><img src="{{AssetUrlPrefix}}/img/404.png" alt="404"></p>
5+
<img style="margin-top: 100px; max-width: 80vw" src="{{AssetUrlPrefix}}/img/404.png" alt="404">
66
<p>{{if .NotFoundPrompt}}{{.NotFoundPrompt}}{{else}}{{ctx.Locale.Tr "error404" | Safe}}{{end}}</p>
77
{{if .NotFoundGoBackURL}}<a class="ui button green" href="{{.NotFoundGoBackURL}}">{{ctx.Locale.Tr "go_back"}}</a>{{end}}
88

0 commit comments

Comments
 (0)