From 8698bad0b9f7bf9edb05038b9124c3f52d053463 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 29 Sep 2023 22:55:17 +0200
Subject: [PATCH 1/2] Feed UI Improvements

---
 templates/user/dashboard/feeds.tmpl | 28 +++++++++++++++-------------
 web_src/css/shared/flex-list.css    |  1 -
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index eb1b503a1f8f3..fbde973eaeb79 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -4,7 +4,7 @@
 			<div class="flex-item-leading">
 				{{ctx.AvatarUtils.AvatarByAction .}}
 			</div>
-			<div class="flex-item-main gt-gap-3">
+			<div class="flex-item-main gt-gap-4">
 				<div>
 					{{if gt .ActUser.ID 0}}
 						<a href="{{AppSubUrl}}/{{(.GetActUserName ctx) | PathEscape}}" title="{{.GetDisplayNameTitle ctx}}">{{.GetDisplayName ctx}}</a>
@@ -78,20 +78,23 @@
 						{{$reviewer := index .GetIssueInfos 1}}
 						{{ctx.Locale.Tr "action.review_dismissed" ((printf "%s/pulls/%s" (.GetRepoLink ctx) $index) |Escape) $index ((.ShortRepoPath ctx)|Escape) $reviewer | Str2html}}
 					{{end}}
+					{{TimeSince .GetCreate ctx.Locale}}
 				</div>
 				{{if .GetOpType.InActions "commit_repo" "mirror_sync_push"}}
 					{{$push := ActionContent2Commits .}}
 					{{$repoLink := (.GetRepoLink ctx)}}
-					{{range $push.Commits}}
-						{{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
-						<div class="flex-text-block">
-							<img class="ui avatar" src="{{$push.AvatarLink $.Context .AuthorEmail}}" title="{{.AuthorName}}" width="16" height="16">
-							<a class="gt-mono" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
-							<span class="text truncate light grey">
-								{{RenderCommitMessage $.Context .Message $repoLink $.ComposeMetas}}
-							</span>
-						</div>
-					{{end}}
+					<div class="gt-df gt-fc gt-gap-2">
+						{{range $push.Commits}}
+							{{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
+							<div class="flex-text-block">
+								<img class="ui avatar" src="{{$push.AvatarLink $.Context .AuthorEmail}}" title="{{.AuthorName}}" width="16" height="16">
+								<a class="ui sha label gt-mono" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
+								<span class="text truncate">
+									{{RenderCommitMessage $.Context .Message $repoLink $.ComposeMetas}}
+								</span>
+							</div>
+						{{end}}
+					</div>
 					{{if and (gt $push.Len 1) $push.CompareURL}}
 						<a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{ctx.Locale.Tr "action.compare_commits" $push.Len}} »</a>
 					{{end}}
@@ -103,7 +106,7 @@
 					<a href="{{.GetCommentLink ctx}}" class="text truncate issue title">{{(.GetIssueTitle ctx) | RenderEmoji $.Context | RenderCodeBlock}}</a>
 					{{$comment := index .GetIssueInfos 1}}
 					{{if gt (len $comment) 0}}
-						<div class="flex-item-body">{{$comment | RenderEmoji $.Context | RenderCodeBlock}}</div>
+						<div class="markup gt-font-14">{{RenderMarkdownToHtml ctx $comment}}</div>
 					{{end}}
 				{{else if .GetOpType.InActions "merge_pull_request"}}
 					<div class="flex-item-body">{{index .GetIssueInfos 1}}</div>
@@ -113,7 +116,6 @@
 				<div class="flex-item-body">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</div>
 				<div class="flex-item-body">{{index .GetIssueInfos 2 | RenderEmoji $.Context}}</div>
 				{{end}}
-				<div class="flex-item-body">{{TimeSince .GetCreate ctx.Locale}}</div>
 			</div>
 			<div class="flex-item-trailing">
 				{{svg (printf "octicon-%s" (ActionIcon .GetOpType)) 32 "text grey gt-mr-2"}}
diff --git a/web_src/css/shared/flex-list.css b/web_src/css/shared/flex-list.css
index a7cfc8f163963..93d8c9b49caf6 100644
--- a/web_src/css/shared/flex-list.css
+++ b/web_src/css/shared/flex-list.css
@@ -69,7 +69,6 @@
 }
 
 .flex-item .flex-item-body {
-  font-size: 13px;
   display: flex;
   align-items: center;
   flex-wrap: wrap;

From 32015eeae23f6b9c68f7524440ce1093c22b26b8 Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Fri, 29 Sep 2023 23:04:30 +0200
Subject: [PATCH 2/2] remove useless class

---
 templates/user/dashboard/feeds.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index fbde973eaeb79..876a245fe9cdd 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -4,7 +4,7 @@
 			<div class="flex-item-leading">
 				{{ctx.AvatarUtils.AvatarByAction .}}
 			</div>
-			<div class="flex-item-main gt-gap-4">
+			<div class="flex-item-main gt-gap-3">
 				<div>
 					{{if gt .ActUser.ID 0}}
 						<a href="{{AppSubUrl}}/{{(.GetActUserName ctx) | PathEscape}}" title="{{.GetDisplayNameTitle ctx}}">{{.GetDisplayName ctx}}</a>
@@ -88,7 +88,7 @@
 							{{$commitLink := printf "%s/commit/%s" $repoLink .Sha1}}
 							<div class="flex-text-block">
 								<img class="ui avatar" src="{{$push.AvatarLink $.Context .AuthorEmail}}" title="{{.AuthorName}}" width="16" height="16">
-								<a class="ui sha label gt-mono" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
+								<a class="ui sha label" href="{{$commitLink}}">{{ShortSha .Sha1}}</a>
 								<span class="text truncate">
 									{{RenderCommitMessage $.Context .Message $repoLink $.ComposeMetas}}
 								</span>