From efec0d393bebf2d66e8120834cda9bc314602efd Mon Sep 17 00:00:00 2001 From: zeripath <art27@cantab.net> Date: Fri, 28 Feb 2020 02:03:17 +0000 Subject: [PATCH] Fix the signing icon in the view_list.tmpl page (#10511) * Fix the view_list.tmpl page * fix-centerlock * Update web_src/less/_base.less as per @silverwind Co-Authored-By: silverwind <me@silverwind.io> Co-authored-by: silverwind <me@silverwind.io> Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> --- templates/repo/view_list.tmpl | 10 +++++----- web_src/less/_base.less | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index c296eb7bee..a1c8c133ec 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -16,10 +16,11 @@ {{end}} {{end}} <a rel="nofollow" class="ui sha label {{if .LatestCommit.Signature}} isSigned {{if .LatestCommitVerification.Verified }} isVerified{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}Untrusted{{else}}Unmatched{{end}}{{else if .LatestCommitVerification.Warning}} isWarning{{end}}{{end}}" href="{{.RepoLink}}/commit/{{.LatestCommit.ID}}"> - <span class="shortsha">{{ShortSha .LatestCommit.ID.String}}</span> + <span class="shortsha">{{ShortSha .LatestCommit.ID.String}}</span> + <div class="ui detail icon button"> {{if .LatestCommit.Signature}} {{if .LatestCommitVerification.Verified}} - <div class="ui detail icon button" title="{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}{{.i18n.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.LatestCommitVerification.Reason}}"> + <div title="{{if eq .LatestCommitVerification.TrustStatus "trusted"}}{{else if eq .LatestCommitVerification.TrustStatus "untrusted"}}{{.i18n.Tr "repo.commits.signed_by_untrusted_user"}}: {{else}}{{.i18n.Tr "repo.commits.signed_by_untrusted_user_unmatched"}}: {{end}}{{.LatestCommitVerification.Reason}}"> {{if ne .LatestCommitVerification.SigningUser.ID 0}} <i class="lock icon"></i> <img class="ui signature avatar image" src="{{.LatestCommitVerification.SigningUser.RelAvatarLink}}" /> @@ -32,11 +33,10 @@ {{end}} </div> {{else}} - <div class="ui detail icon button"> - <i title="{{$.i18n.Tr .LatestCommitVerification.Reason}}" class="unlock icon"></i> - </div> + <i title="{{$.i18n.Tr .LatestCommitVerification.Reason}}" class="unlock icon"></i> {{end}} {{end}} + </div> </a> {{template "repo/commit_status" .LatestCommitStatus}} {{ $commitLink:= printf "%s/commit/%s" .RepoLink .LatestCommit.ID }} diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 1df0124542..b9000b6916 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -1034,7 +1034,7 @@ i.icons .icon:first-child { } i.icon.centerlock { - top: 1.5em; + top: 1.45em; } .ui.label > .detail .icons {