public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-03 08:02:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix styling for commiter on diff view (#11715) (#11744)

Browse Source 
* Fix styling for commiter on diff view

* Update options/locale/locale_en-US.ini

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <me@silverwind.io>

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <me@silverwind.io>

* Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
(cherry picked from commit 8e035f81c0)
This commit is contained in:
Cirno the Strongest
2020-06-03 10:29:19 +02:00
committed by GitHub
parent 7339018c5e
commit f428d40822
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View File

@@ -1647,6 +1647,7 @@ diff.review.placeholder = Review comment
diff.review.comment = Comment diff.review.comment = Comment
diff.review.approve = Approve diff.review.approve = Approve
diff.review.reject = Request changes diff.review.reject = Request changes
diff.committed_by = committed by
releases.desc = Track project versions and downloads. releases.desc = Track project versions and downloads.
release.releases = Releases release.releases = Releases

13
templates/repo/commit_page.tmpl
View File

@@ -31,7 +31,7 @@
</div> </div>
<div class="ui attached info segment {{$class}}"> <div class="ui attached info segment {{$class}}">
<div class="ui stackable grid"> <div class="ui stackable grid">
<div class="ten wide column"> <div class="nine wide column">
{{if .Author}} {{if .Author}}
<img class="ui avatar image" src="{{.Author.RelAvatarLink}}" /> <img class="ui avatar image" src="{{.Author.RelAvatarLink}}" />
{{if .Author.FullName}} {{if .Author.FullName}}
@@ -43,8 +43,10 @@
<img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" /> <img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" />
<strong>{{.Commit.Author.Name}}</strong> <strong>{{.Commit.Author.Name}}</strong>
{{end}} {{end}}
<span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span>
{{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}}
<span> </span> <div class="committed-by">
<span class="text grey">{{svg "octicon-git-commit" 16}}{{.i18n.Tr "repo.diff.committed_by"}}</span>
{{if ne .Verification.CommittingUser.ID 0}} {{if ne .Verification.CommittingUser.ID 0}}
<img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" /> <img class="ui avatar image" src="{{.Verification.CommittingUser.RelAvatarLink}}" />
<a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong> &lt;{{.Commit.Committer.Email}}&gt;</a> <a href="{{.Verification.CommittingUser.HomeLink}}"><strong>{{.Commit.Committer.Name}}</strong> &lt;{{.Commit.Committer.Email}}&gt;</a>
@@ -52,10 +54,11 @@
<img class="ui avatar image" src="{{AvatarLink .Commit.Committer.Email}}" /> <img class="ui avatar image" src="{{AvatarLink .Commit.Committer.Email}}" />
<strong>{{.Commit.Committer.Name}}</strong> <strong>{{.Commit.Committer.Name}}</strong>
{{end}} {{end}}
{{end}}
<span class="text grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span>
</div> </div>
<div class="six wide right aligned column"> {{end}}
</div>
<div class="seven wide right aligned column">
<div class="ui horizontal list"> <div class="ui horizontal list">
{{if .Parents}} {{if .Parents}}
<div class="item"> <div class="item">

18
web_src/less/_repository.less
View File

@@ -2293,6 +2293,24 @@
} }
} }
} }
&.diff .committed-by {
padding-top: .5rem;
.ui.avatar {
width: 20px;
height: 20px;
}
span {
margin-right: .25rem;
svg {
vertical-align: text-bottom;
margin-right: 2px;
}
}
}
} }
// End of .repository // End of .repository