From d34fd65d95edc849d93f9ac59ca19fc1aeecbe56 Mon Sep 17 00:00:00 2001 From: Norwin Roosen Date: Thu, 25 Mar 2021 02:34:23 +0100 Subject: [PATCH 1/2] add link to previous blame I'd add a tooltip, but how do I i18n with this code..?! --- routers/repo/blame.go | 4 +++- web_src/less/_base.less | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/routers/repo/blame.go b/routers/repo/blame.go index 9be1ea05af9b4..4d581484d0c49 100644 --- a/routers/repo/blame.go +++ b/routers/repo/blame.go @@ -218,7 +218,9 @@ func renderBlame(ctx *context.Context, blameParts []git.BlamePart, commitNames m avatar = string(templates.AvatarByEmail(commit.Author.Email, commit.Author.Name, 18, "mr-3")) } - commitInfo.WriteString(fmt.Sprintf(`
%s
%s
`, attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince)) + previousBlameLink := fmt.Sprintf(``, repoLink, part.Sha, ctx.Repo.TreePath) + commitInfo.WriteString(fmt.Sprintf(`
%s
%s
%s
`, + attr, avatar, repoLink, part.Sha, html.EscapeString(commit.CommitMessage), commitSince, previousBlameLink)) } else { commitInfo.WriteString(fmt.Sprintf(`
`, attr)) } diff --git a/web_src/less/_base.less b/web_src/less/_base.less index 1ce5e9d0ad9d3..a0801a1d49dcb 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -1498,9 +1498,14 @@ a.ui.label:hover { } .blame-time, - .blame-avatar { + .blame-avatar, + .blame-previous { flex-shrink: 0; } + + .blame-previous { + padding-left: 8px; + } } } From 0b4d5f207d3bde45cb97e29f7cfb5f0179ed7457 Mon Sep 17 00:00:00 2001 From: Norwin Roosen Date: Thu, 25 Mar 2021 02:34:54 +0100 Subject: [PATCH 2/2] fix blame row alignment on firefox --- web_src/less/_base.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/web_src/less/_base.less b/web_src/less/_base.less index a0801a1d49dcb..baed85eefccf0 100644 --- a/web_src/less/_base.less +++ b/web_src/less/_base.less @@ -1512,6 +1512,8 @@ a.ui.label:hover { .ui.avatar.image { height: 18px; width: 18px; + display: block; + margin-top: 1px; } }