From 4aecc21a45a9ce669ea98e03b504912e8f3f80e1 Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Tue, 23 Aug 2022 09:45:06 +0200
Subject: [PATCH] Updated Audit log filter dropdown

refs. https://github.com/TryGhost/Toolbox/issues/356

- The order of the items in the dropdown wasn't representing importance, also it took up a bit too much vertical space
---
 .../settings/audit-log/event-filter.hbs         |  2 +-
 .../settings/audit-log/event-filter.js          |  4 ++--
 .../app/styles/layouts/member-activity.css      | 17 +++++++++--------
 ghost/admin/app/styles/layouts/settings.css     |  4 ++++
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ghost/admin/app/components/settings/audit-log/event-filter.hbs b/ghost/admin/app/components/settings/audit-log/event-filter.hbs
index 2f0ad3c778..a5bd18f5a3 100644
--- a/ghost/admin/app/components/settings/audit-log/event-filter.hbs
+++ b/ghost/admin/app/components/settings/audit-log/event-filter.hbs
@@ -6,7 +6,7 @@
         </span>
     </dd.Trigger>
 
-    <dd.Content class="gh-member-activity-actions-menu dropdown-menu dropdown-triangle-top-right">
+    <dd.Content class="gh-member-activity-actions-menu gh-activity-log-actions dropdown-menu dropdown-triangle-top-right">
         {{!-- NOTE: re-using ember-power-select-options styles --}}
         <ul class="ember-power-select-options" role="listbox">
             {{#each this.eventTypes as |type idx|}}
diff --git a/ghost/admin/app/components/settings/audit-log/event-filter.js b/ghost/admin/app/components/settings/audit-log/event-filter.js
index a95030808a..4b0d3e7dc5 100644
--- a/ghost/admin/app/components/settings/audit-log/event-filter.js
+++ b/ghost/admin/app/components/settings/audit-log/event-filter.js
@@ -11,12 +11,12 @@ const ALL_RESOURCE_TYPES = [
     {event: 'post', icon: 'event-filter-payment', name: 'Posts'},
     {event: 'page', icon: 'event-filter-payment', name: 'Pages'},
     {event: 'tag', icon: 'event-filter-newsletter', name: 'Tags'},
+    {event: 'label', icon: 'event-filter-newsletter', name: 'Member labels'},
     {event: 'user', icon: 'idk', name: 'Users'},
     {event: 'setting', icon: 'event-filter-newsletter', name: 'Settings'},
     {event: 'integration', icon: 'event-filter-newsletter', name: 'Integrations'},
     {event: 'api_key', icon: 'event-filter-newsletter', name: 'API keys'},
-    {event: 'webhook', icon: 'event-filter-newsletter', name: 'Webhooks'},
-    {event: 'label', icon: 'event-filter-newsletter', name: 'Labels'}
+    {event: 'webhook', icon: 'event-filter-newsletter', name: 'Webhooks'}
 ];
 
 export default class AuditLogEventFilter extends Component {
diff --git a/ghost/admin/app/styles/layouts/member-activity.css b/ghost/admin/app/styles/layouts/member-activity.css
index bd135f30da..d56f67ca3a 100644
--- a/ghost/admin/app/styles/layouts/member-activity.css
+++ b/ghost/admin/app/styles/layouts/member-activity.css
@@ -199,16 +199,20 @@
     margin-top: 8px;
 }
 
+.gh-member-activity-actions-menu ul {
+    max-height: 60vh !important;
+}
+
 .gh-member-activity-actions-menu ul li {
-    margin: 0 2rem;
+    padding: 3px 2rem !important;
 }
 
 .gh-member-activity-actions-menu ul li:first-of-type {
-    margin-top: 2rem;
+    padding-top: 2rem !important;
 }
 
 .gh-member-activity-actions-menu ul li:last-of-type {
-    margin-bottom: 2rem;
+    padding-bottom: 2rem !important;
 }
 
 .gh-member-activity-actions-menu h3 {
@@ -241,13 +245,10 @@
 }
 
 .gh-member-activity-actions-menu .ember-power-select-option label p {
-    display: flex;
-    align-items: center;
-    justify-content: flex-start;
     color: var(--darkgrey);
-    font-weight: 500;
+    font-weight: 400;
     font-size: 1.4rem;
-    padding: 0.125rem 6rem 0 0.25rem;
+    padding: 0.125rem 0 0 0.25rem;
     margin: 0;
 }
 
diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css
index 591ad53ec9..5b1f7bb0fa 100644
--- a/ghost/admin/app/styles/layouts/settings.css
+++ b/ghost/admin/app/styles/layouts/settings.css
@@ -2898,4 +2898,8 @@ p.theme-validation-details {
 
 .gh-audit-log-name {
     margin-bottom: 0 !important;
+}
+
+.gh-activity-log-actions ul {
+    width: 240px;
 }
\ No newline at end of file