From 22b058666702870aeff3f6076695817687446ddc Mon Sep 17 00:00:00 2001
From: James Morris <moreofmorris@users.noreply.github.com>
Date: Thu, 25 Aug 2022 16:01:47 +0100
Subject: [PATCH] Tweaks to column sizes for events and a way to show new event
 icons for feature flag

- Has better column widths and fixed a bug with the time one
- Now allows to show alternative icons for feature flag

refs https://github.com/TryGhost/Team/issues/1851
---
 ghost/admin/app/helpers/parse-member-event.js |  2 +-
 .../app/styles/layouts/member-activity.css    | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ghost/admin/app/helpers/parse-member-event.js b/ghost/admin/app/helpers/parse-member-event.js
index 6b9a16e9ac..949655ccca 100644
--- a/ghost/admin/app/helpers/parse-member-event.js
+++ b/ghost/admin/app/helpers/parse-member-event.js
@@ -81,7 +81,7 @@ export default class ParseMemberEventHelper extends Helper {
             icon = 'comment';
         }
 
-        return 'event-' + icon;
+        return 'event-' + icon + (this.feature.get('memberAttribution') ? '--feature-attribution' : '');
     }
 
     getAction(event, hasMultipleNewsletters) {
diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css
index 947cde542f..d48ceae419 100644
--- a/ghost/admin/app/styles/layouts/member-activity.css
+++ b/ghost/admin/app/styles/layouts/member-activity.css
@@ -102,15 +102,20 @@
 }
 
 .gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:nth-child(2) {
-    width: 25%;
-}
-
-.gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:nth-child(3) {
-    width: 35%;
+    width: 58%;
 }
 
 .gh-members-activity.feature-memberAttribution .gh-list-scrolling thead th:last-child {
-    width: 15%;
+    width: 18%;
+}
+
+.gh-members-activity.gh-members-activity-single.feature-memberAttribution .gh-list-scrolling thead th:nth-child(1) {
+    width: 82%;
+}
+
+.gh-members-activity.gh-members-activity-single.feature-memberAttribution .gh-list-scrolling thead th:nth-child(2),
+.gh-members-activity.gh-members-activity-single.feature-memberAttribution .gh-list-scrolling thead th:last-child  {
+    width: 18%;
 }
 
 .gh-members-activity .gh-list-scrolling tbody .gh-list-data:last-child {
@@ -158,7 +163,7 @@
 }
 
 .gh-members-activity-description.feature-memberAttribution a {
-    font-weight: 500;
+    font-weight: 400;
     color: var(--midgrey) !important;
     transition: all 150ms ease;
 }