mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Fix styling and padding for commit list on PR view (#11588) 

* Fix styling and padding for commit list on PR view

* fix bold on author
This commit is contained in:
Cirno the Strongest 2020-05-24 00:05:20 +02:00 committed by GitHub
parent 31df012968
commit ac3c467770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/repo/commits_list_small.tmpl
View File

@ -1,9 +1,10 @@
{{ $r:= List .Commits}} {{ $r:= List .Commits}}
{{ $index := 0}} {{ $index := 0}}
<div class="timeline-item commits-list">
{{range $r}} {{range $r}}
{{ $tag := printf "%s-%d" $.HashTag $index }} {{ $tag := printf "%s-%d" $.HashTag $index }}
{{ $index = Add $index 1}} {{ $index = Add $index 1}}
<div class="timeline-item event small-line-spacing" id="{{$tag}}"> <div class="singular-commit" id="{{$tag}}">
<span class="badge badge-commit">{{svg "octicon-git-commit" 16}}</span> <span class="badge badge-commit">{{svg "octicon-git-commit" 16}}</span>
{{if .User}} {{if .User}}
<a class="ui avatar image" href="{{AppSubUrl}}/{{.User.Name}}"><img src="{{.User.RelAvatarLink}}" alt=""/></a> <a class="ui avatar image" href="{{AppSubUrl}}/{{.User.Name}}"><img src="{{.User.RelAvatarLink}}" alt=""/></a>
@ -42,7 +43,7 @@
<span class="message-wrapper"> <span class="message-wrapper">
{{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.Issue.PullRequest.BaseRepo.OwnerName $.Issue.PullRequest.BaseRepo.Name .ID }} {{ $commitLink:= printf "%s/%s/%s/commit/%s" AppSubUrl $.Issue.PullRequest.BaseRepo.OwnerName $.Issue.PullRequest.BaseRepo.Name .ID }}
<span class="commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.Issue.PullRequest.BaseRepo.ComposeMetas}}</span> <span class="mono commit-summary has-emoji{{if gt .ParentCount 1}} grey text{{end}}" title="{{.Summary}}">{{RenderCommitMessageLinkSubject .Message ($.Issue.PullRequest.BaseRepo.Link|Escape) $commitLink $.Issue.PullRequest.BaseRepo.ComposeMetas}}</span>
</span> </span>
{{if IsMultilineCommitMessage .Message}} {{if IsMultilineCommitMessage .Message}}
<button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button> <button class="basic compact mini ui icon button commit-button"><i class="ellipsis horizontal icon"></i></button>
@ -55,3 +56,4 @@
{{end}} {{end}}
</div> </div>
{{end}} {{end}}
</div>

2
templates/repo/issue/view_content/comments.tmpl
View File

@ -602,7 +602,7 @@
<img src="{{.Poster.RelAvatarLink}}"> <img src="{{.Poster.RelAvatarLink}}">
</a> </a>
<span class="text grey"> <span class="text grey">
<a href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a> <a class="author" href="{{.Poster.HomeLink}}">{{.Poster.GetDisplayName}}</a>
{{ if .IsForcePush }} {{ if .IsForcePush }}
{{$.i18n.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr | Safe}} {{$.i18n.Tr "repo.issues.force_push_codes" $.Issue.PullRequest.HeadBranch (ShortSha .OldCommit) ($.Issue.Repo.CommitLink .OldCommit) (ShortSha .NewCommit) ($.Issue.Repo.CommitLink .NewCommit) $createdStr | Safe}}
{{else}} {{else}}

9
web_src/less/_repository.less
View File

@ -751,11 +751,11 @@
} }
} }
&:first-child { &:first-child:not(.commit) {
padding-top: 0 !important; padding-top: 0 !important;
} }
&:last-child { &:last-child:not(.commit) {
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
@ -807,8 +807,9 @@
line-height: 30px; line-height: 30px;
} }
&.event.small-line-spacing { &.commits-list {
padding: 2px 0 0 15px; padding-left: 15px;
padding-top: 0;
} }
&.event > .commit-status-link { &.event > .commit-status-link {