From 418d5ae11c5136b051822d0b8b2b4c2f67b5c2ef Mon Sep 17 00:00:00 2001
From: James Morris <james.morris@ghost.org>
Date: Tue, 1 Feb 2022 12:57:11 +0000
Subject: [PATCH] Bug fix for member activity mini view when flag is off

refs: https://github.com/TryGhost/Team/issues/1298

- careful consideration for styles when feature flag is on and off
- removed an unnecessary class name that helped fix
---
 .../app/components/member/activity-feed.hbs   |  2 +-
 ghost/admin/app/styles/layouts/members.css    | 52 +++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/app/components/member/activity-feed.hbs b/ghost/admin/app/components/member/activity-feed.hbs
index 636648189d..52b6de7af7 100644
--- a/ghost/admin/app/components/member/activity-feed.hbs
+++ b/ghost/admin/app/components/member/activity-feed.hbs
@@ -19,7 +19,7 @@
                                                 {{#if event.email}}
                                                     <GhEmailPreviewLink @data={{event.email}} class="gh-member-feed-title" />
                                                 {{else}}
-                                                    <span class="gh-member-feed-title">{{event.action}} {{event.object}}</span>
+                                                    {{event.action}} {{event.object}}
                                                 {{/if}}
                                             </div>
                                             <div class="gh-member-feed-time">
diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css
index 092949985c..fdd47c2e32 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -762,6 +762,58 @@ textarea.gh-member-details-textarea {
     padding: 1rem 0;
 }
 
+.gh-member-feed {
+    margin: -12px 0 -8px;
+}
+
+.gh-member-feed-row {
+    display: flex;
+    align-items: flex-start;
+    padding: 0;
+}
+
+.gh-member-feed-activity {
+    display: flex;
+    align-items: center;
+    padding: 12px 0;
+}
+
+.gh-member-feed-activity svg {
+    width: 16px;
+    margin-right: 1rem;
+}
+
+.gh-member-feed-title {
+    display: table-cell;
+    padding: 10px 0;
+    line-height: 1.4em;
+    vertical-align: middle;
+    color: var(--darkgrey);
+    text-align: left;
+    font-weight: 500;
+}
+
+.gh-member-feed-title:hover {
+    color: var(--black);
+}
+
+.gh-member-feed-date {
+    margin-left: auto;
+    padding: 10px 0 10px 16px;
+    color: var(--midgrey);
+    font-size: 1.3rem;
+    text-align: right;
+    white-space: nowrap;
+}
+
+.gh-member-feed-row:hover .gh-member-feed-date {
+    color: var(--darkgrey);
+}
+
+.gh-member-btn-expandfeed {
+    margin: 8px 0;
+}
+
 .gh-member-feed-row:first-child .gh-member-feed-container {
     padding-top: 0;
 }