From c0a5d25c461c7f64dea5e43a88f83aff212d8ba2 Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Fri, 10 Sep 2021 15:01:59 +0200
Subject: [PATCH] Members filter UI refinements

- changed copy for label filter relation
- fixed darkmode bug
- unified label dropdown tag colors
---
 ghost/admin/app/components/gh-members-filter-labs.js |  4 ++--
 ghost/admin/app/styles/app-dark.css                  | 12 ++++++++++++
 ghost/admin/app/styles/components/power-select.css   | 10 +++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ghost/admin/app/components/gh-members-filter-labs.js b/ghost/admin/app/components/gh-members-filter-labs.js
index 22c94302f3..55d941440f 100644
--- a/ghost/admin/app/components/gh-members-filter-labs.js
+++ b/ghost/admin/app/components/gh-members-filter-labs.js
@@ -56,8 +56,8 @@ const FILTER_RELATIONS_OPTIONS = {
         {label: 'is not', name: 'is-not'}
     ],
     label: [
-        {label: 'is in', name: 'is'},
-        {label: 'is not in', name: 'is-not'}
+        {label: 'is', name: 'is'},
+        {label: 'is not', name: 'is-not'}
     ],
     email_count: [
         {label: 'is', name: 'is'},
diff --git a/ghost/admin/app/styles/app-dark.css b/ghost/admin/app/styles/app-dark.css
index 172eafc083..8cf47ae201 100644
--- a/ghost/admin/app/styles/app-dark.css
+++ b/ghost/admin/app/styles/app-dark.css
@@ -981,3 +981,15 @@ input:focus,
     top: 0;
     right: -2px;
 }
+
+.gh-list-scrolling thead th {
+    background: linear-gradient(90deg, rgba(21,23,25,1) 90%, rgba(21,23,25,0) 100%);
+}
+
+.gh-list-scrolling tbody .gh-list-data:first-child {
+    background: linear-gradient(90deg, rgba(21,23,25,1) 90%, rgba(21,23,25,0) 100%);
+}
+
+.gh-filter-builder .gh-filters {
+    background: var(--whitegrey);
+}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/components/power-select.css b/ghost/admin/app/styles/components/power-select.css
index 269681451a..33ef8bff39 100644
--- a/ghost/admin/app/styles/components/power-select.css
+++ b/ghost/admin/app/styles/components/power-select.css
@@ -205,12 +205,12 @@
 .ember-power-select-multiple-option {
     margin: 2px;
     padding: 2px 6px;
-    border: 1px solid var(--black-20);
     border-radius: 3px;
     font-size: 0.93em;
     font-weight: 500;
-    color: white;
-    background: var(--black);
+    border: 1px solid var(--whitegrey-d1);
+    color: var(--darkgrey);
+    background: var(--whitegrey-d1);
 }
 
 .ember-power-select-multiple-remove-btn {
@@ -227,9 +227,9 @@
 }
 
 .ember-power-select-multiple-remove-btn svg path {
-    stroke: white;
     stroke-width: 2px;
-    fill: white;
+    stroke: var(--black);
+    fill: var(--black);
 }
 
 .ember-power-select-trigger-multiple-input {