From c0951fe0e3b4dea38064515546b1825c1bcf19e1 Mon Sep 17 00:00:00 2001
From: Vladimir Panteleev <git@thecybershadow.net>
Date: Tue, 21 May 2019 16:10:27 +0000
Subject: [PATCH] Move note bubble inside the commit bubble

---
 templates/repo/diff/page.tmpl | 48 +++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/templates/repo/diff/page.tmpl b/templates/repo/diff/page.tmpl
index 9fee2b3221..e0c38816c0 100644
--- a/templates/repo/diff/page.tmpl
+++ b/templates/repo/diff/page.tmpl
@@ -13,6 +13,30 @@
 				{{if IsMultilineCommitMessage .Commit.Message}}
 					<pre class="commit-body">{{RenderCommitBody .Commit.Message $.RepoLink $.Repository.ComposeMetas}}</pre>
 				{{end}}
+				{{if .Note}}
+					<div class="ui top attached info clearing segment">
+						<h3>{{.i18n.Tr "repo.diff.git-notes"}}</h3>
+						<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
+					</div>
+					<div class="ui bottom attached info segment">
+						<div class="ui stackable grid">
+							<div class="nine wide column">
+								{{if .NoteAuthor}}
+									<img class="ui avatar image" src="{{.NoteAuthor.RelAvatarLink}}" />
+								{{if .NoteAuthor.FullName}}
+								<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteAuthor.FullName}}</strong></a>
+								{{else}}
+								<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteCommit.Author.Name}}</strong></a>
+								{{end}}
+								{{else}}
+									<img class="ui avatar image" src="{{AvatarLink .NoteCommit.Author.Email}}" />
+									<strong>{{.NoteCommit.Author.Name}}</strong>
+								{{end}}
+								<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
+							</div>
+						</div><!-- end grid -->
+					</div>
+				{{end}}
 				<span class="text grey"><i class="octicon octicon-git-branch"></i>{{.BranchName}}</span>
 			</div>
 			<div class="ui attached info segment {{if .Commit.Signature}} isSigned {{if .Verification.Verified }} isVerified {{end}}{{end}}">
@@ -65,30 +89,6 @@
 					</div>
 				{{end}}
 			{{end}}
-			{{if .Note}}
-				<div class="ui top attached info clearing segment">
-					<h3>{{.i18n.Tr "repo.diff.git-notes"}}</h3>
-					<pre class="commit-body">{{RenderNote .Note $.RepoLink $.Repository.ComposeMetas}}</pre>
-				</div>
-				<div class="ui bottom attached info segment">
-					<div class="ui stackable grid">
-						<div class="nine wide column">
-							{{if .NoteAuthor}}
-								<img class="ui avatar image" src="{{.NoteAuthor.RelAvatarLink}}" />
-							{{if .NoteAuthor.FullName}}
-							<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteAuthor.FullName}}</strong></a>
-							{{else}}
-							<a href="{{.NoteAuthor.HomeLink}}"><strong>{{.NoteCommit.Author.Name}}</strong></a>
-							{{end}}
-							{{else}}
-								<img class="ui avatar image" src="{{AvatarLink .NoteCommit.Author.Email}}" />
-								<strong>{{.NoteCommit.Author.Name}}</strong>
-							{{end}}
-							<span class="text grey" id="note-authored-time">{{TimeSince .NoteCommit.Author.When $.Lang}}</span>
-						</div>
-					</div><!-- end grid -->
-				</div>
-			{{end}}
 		{{end}}
 
 		{{template "repo/diff/box" .}}