diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/diff/box.tmpl | 4 | ||||
| -rw-r--r-- | templates/repo/diff/compare.tmpl | 27 | ||||
| -rw-r--r-- | templates/repo/pulls/files.tmpl | 2 |
3 files changed, 18 insertions, 15 deletions
diff --git a/templates/repo/diff/box.tmpl b/templates/repo/diff/box.tmpl index 21ea63cc0a..26b863acea 100644 --- a/templates/repo/diff/box.tmpl +++ b/templates/repo/diff/box.tmpl @@ -1,6 +1,6 @@ {{if .DiffNotAvailable}} - <div class="diff-detail-box diff-box sticky"> - <div> + <div> + <div class="diff-detail-box diff-box sticky"> <div class="ui right"> {{template "repo/diff/whitespace_dropdown" .}} {{template "repo/diff/options_dropdown" .}} diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index 3ec08b00ac..cb6dca441e 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -1,8 +1,8 @@ {{template "base/head" .}} <div role="main" aria-label="{{.Title}}" class="page-content repository diff {{if .PageIsComparePull}}compare pull{{end}}"> {{template "repo/header" .}} - <div class="ui container fluid padded"> - + {{$showDiffBox := false}} + <div class="ui container"> <h2 class="ui header"> {{if and $.PageIsComparePull $.IsSigned (not .Repository.IsArchived)}} {{.locale.Tr "repo.pulls.compare_changes"}} @@ -34,11 +34,6 @@ {{- if eq $.HeadRepo.OwnerName .RootRepo.OwnerName -}} {{- $HeadCompareName = printf "%s/%s" $.HeadRepo.OwnerName $.HeadRepo.Name -}} {{- end -}} - {{- if .OwnForkRepo -}} - {{- if eq $.OwnForkRepo.OwnerName .RootRepo.OwnerName -}} - {{- $OwnForkRepoCompareName = printf "%s/%s" $.OwnForkRepo.OwnerName $.OwnForkRepo.Name -}} - {{- end -}} - {{- end -}} {{- end -}} <div class="ui segment choose branch"> <a href="{{$.HeadRepo.Link}}/compare/{{PathEscapeSegments $.HeadBranch}}{{$.CompareSeparator}}{{if not $.PullRequestCtx.SameRepo}}{{PathEscape $.BaseName}}/{{PathEscape $.Repository.Name}}:{{end}}{{PathEscapeSegments $.BaseBranch}}" title="{{.locale.Tr "repo.pulls.switch_head_and_base"}}">{{svg "octicon-git-compare"}}</a> @@ -203,14 +198,15 @@ <span class="index">#{{.PullRequest.Issue.Index}}</span> </h1> </div> - <div class="four wide right middle aligned column"> + <div class="four wide column middle aligned text right"> {{- if .PullRequest.HasMerged -}} <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button purple show-form">{{svg "octicon-git-merge" 16}} {{.locale.Tr "repo.pulls.view"}}</a> {{else if .Issue.IsClosed}} <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button red show-form">{{svg "octicon-issue-closed" 16}} {{.locale.Tr "repo.pulls.view"}}</a> {{else}} <a href="{{Escape $.RepoLink}}/pulls/{{.PullRequest.Issue.Index}}" class="ui button green show-form">{{svg "octicon-git-pull-request" 16}} {{.locale.Tr "repo.pulls.view"}}</a> - {{end}}</div> + {{end}} + </div> </div> {{else}} {{if and $.IsSigned (not .Repository.IsArchived)}} @@ -231,13 +227,20 @@ {{template "repo/issue/new_form" .}} </div> {{end}} - {{template "repo/commits_table" .}} - {{template "repo/diff/box" .}} + {{$showDiffBox = true}} {{end}} {{else}} + {{$showDiffBox = true}} + {{end}} + </div> + + {{if $showDiffBox}} + <div class="ui container"> {{template "repo/commits_table" .}} + </div> + <div class="ui container fluid padded"> {{template "repo/diff/box" .}} - {{end}} </div> + {{end}} </div> {{template "base/footer" .}} diff --git a/templates/repo/pulls/files.tmpl b/templates/repo/pulls/files.tmpl index feec6eae74..402bec800b 100644 --- a/templates/repo/pulls/files.tmpl +++ b/templates/repo/pulls/files.tmpl @@ -5,7 +5,7 @@ <div role="main" aria-label="{{.Title}}" class="page-content repository view issue pull files diff"> {{template "repo/header" .}} - <div class="ui container"> + <div class="ui container fluid padded"> {{template "repo/issue/view_title" .}} {{template "repo/pulls/tab_menu" .}} {{template "repo/diff/box" .}} |