From 6b7e14493783933373b091b9b616f93508915bea Mon Sep 17 00:00:00 2001
From: Sascha Eggenberger <seggenberger@gitlab.com>
Date: Tue, 24 Oct 2023 17:52:18 +0200
Subject: [PATCH] Tidy up Activity feed

Changelog: changed
---
 .../contribution_event/contribution_event_base.vue     | 10 +++++++---
 app/views/events/_event.html.haml                      |  2 +-
 .../contribution_event/contribution_event_base_spec.js |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue b/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue
index e3d3360cd0c923..3b9f14a218fa4c 100644
--- a/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue
+++ b/app/assets/javascripts/contribution_events/components/contribution_event/contribution_event_base.vue
@@ -47,16 +47,20 @@ export default {
 
 <template>
   <li class="gl-mt-5 gl-pb-5 gl-border-b gl-relative">
-    <time-ago-tooltip :time="event.created_at" class="gl-float-right gl-text-secondary" />
+    <time-ago-tooltip
+      :time="event.created_at"
+      class="gl-float-right gl-font-sm gl-text-secondary gl-mt-2"
+    />
     <gl-avatar-link :href="author.web_url">
       <gl-avatar-labeled
         :label="author.name"
         :sub-label="authorUsername"
+        inline-labels
         :src="author.avatar_url"
-        :size="32"
+        :size="24"
       />
     </gl-avatar-link>
-    <div class="gl-pl-8 gl-mt-2" data-testid="event-body">
+    <div class="gl-pl-7" data-testid="event-body">
       <div class="gl-text-secondary">
         <gl-icon :class="iconClass" :name="iconName" />
         <gl-sprintf v-if="message" :message="message">
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 83f7d7437553ef..a3be188854d4ff 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -2,7 +2,7 @@
 
 - if event.visible_to_user?(current_user)
   .event-item
-    .event-item-timestamp
+    .event-item-timestamp.gl-font-sm
       #{time_ago_with_tooltip(event.created_at)}
 
     - if event.wiki_page?
diff --git a/spec/frontend/contribution_events/components/contribution_event/contribution_event_base_spec.js b/spec/frontend/contribution_events/components/contribution_event/contribution_event_base_spec.js
index 310966243d1249..f5850401b8e2b9 100644
--- a/spec/frontend/contribution_events/components/contribution_event/contribution_event_base_spec.js
+++ b/spec/frontend/contribution_events/components/contribution_event/contribution_event_base_spec.js
@@ -38,7 +38,7 @@ describe('ContributionEventBase', () => {
     expect(avatarLink.attributes('href')).toBe(defaultPropsData.event.author.web_url);
     expect(avatarLabeled.attributes()).toMatchObject({
       src: defaultPropsData.event.author.avatar_url,
-      size: '32',
+      size: '24',
     });
     expect(avatarLabeled.props()).toMatchObject({
       label: defaultPropsData.event.author.name,
-- 
GitLab