From 8e035f81c01ba6c1ccf8952ffad37bef063aad2d Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Wed, 3 Jun 2020 04:40:08 +0200 Subject: [PATCH] Fix styling for commiter on diff view (#11715) * Fix styling for commiter on diff view * Update options/locale/locale_en-US.ini * Update templates/repo/commit_page.tmpl Co-authored-by: silverwind * Update templates/repo/commit_page.tmpl Co-authored-by: silverwind * Apply suggestions from code review Co-authored-by: silverwind Co-authored-by: silverwind Co-authored-by: techknowlogick --- options/locale/locale_en-US.ini | 1 + templates/repo/commit_page.tmpl | 27 +++++++++++++++------------ web_src/less/_repository.less | 18 ++++++++++++++++++ 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index f854821827..534520d2d2 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1651,6 +1651,7 @@ diff.review.placeholder = Review comment diff.review.comment = Comment diff.review.approve = Approve diff.review.reject = Request changes +diff.committed_by = committed by releases.desc = Track project versions and downloads. release.releases = Releases diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 7a91663ec8..7a967ee55e 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -33,7 +33,7 @@
-
+
{{if .Author}} {{if .Author.FullName}} @@ -45,19 +45,22 @@ {{.Commit.Author.Name}} {{end}} - {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} - - {{if ne .Verification.CommittingUser.ID 0}} - - {{.Commit.Committer.Name}} <{{.Commit.Committer.Email}}> - {{else}} - - {{.Commit.Committer.Name}} - {{end}} - {{end}} {{TimeSince .Commit.Author.When $.Lang}} + {{if or (ne .Commit.Committer.Name .Commit.Author.Name) (ne .Commit.Committer.Email .Commit.Author.Email)}} +
+ {{svg "octicon-git-commit" 16}}{{.i18n.Tr "repo.diff.committed_by"}} + {{if ne .Verification.CommittingUser.ID 0}} + + {{.Commit.Committer.Name}} <{{.Commit.Committer.Email}}> + {{else}} + + {{.Commit.Committer.Name}} + {{end}} +
+ {{end}} +
-
+
{{if .Parents}}
diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index b387d16079..96e381c163 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -2376,6 +2376,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