From 879c7866e9727a20742c98ce6261690343ff702d Mon Sep 17 00:00:00 2001
From: Peter Zimon <zimo@ghost.org>
Date: Thu, 4 Feb 2021 16:52:19 +0100
Subject: [PATCH] Members screen UI refinements

---
 .../app/components/gh-members-filter.hbs      | 10 ++++---
 ghost/admin/app/styles/layouts/content.css    |  4 +--
 ghost/admin/app/styles/layouts/main.css       | 30 +++++++++++++++----
 ghost/admin/app/styles/layouts/members.css    | 28 ++++++++---------
 ghost/admin/app/styles/patterns/buttons.css   |  7 ++---
 ghost/admin/app/templates/members.hbs         |  2 +-
 6 files changed, 49 insertions(+), 32 deletions(-)

diff --git a/ghost/admin/app/components/gh-members-filter.hbs b/ghost/admin/app/components/gh-members-filter.hbs
index c1c32d852d..be306abd5a 100644
--- a/ghost/admin/app/components/gh-members-filter.hbs
+++ b/ghost/admin/app/components/gh-members-filter.hbs
@@ -1,13 +1,15 @@
 <span class="dropdown dropdown-topmenu">
+    <span class="{{if @selectedLabel.slug "gh-contentfilter-selected"}}">
     <GhDropdownButton
         @dropdownName="members-label-menu"
         @classNames="gh-contentfilter-menu-trigger" @title="Member Labels"
         @data-test-user-actions="true">
-        <span class="{{if @selectedLabel.slug "blue fw6"}} gh-btn-filter-maxwidth" title="{{@selectedLabel.name}}">
-            <span>{{@selectedLabel.name}}</span>
-            {{svg-jar "arrow-down-small"}}
-        </span>
+            <span class="gh-btn-filter-maxwidth" title="{{@selectedLabel.name}}">
+                <span>{{@selectedLabel.name}}</span>
+                {{svg-jar "arrow-down-small"}}
+            </span>
     </GhDropdownButton>
+    </span>
     <GhDropdown
         @name="members-label-menu"
         @tagName="div"
diff --git a/ghost/admin/app/styles/layouts/content.css b/ghost/admin/app/styles/layouts/content.css
index fde2c1d2d8..c3a2d629e6 100644
--- a/ghost/admin/app/styles/layouts/content.css
+++ b/ghost/admin/app/styles/layouts/content.css
@@ -47,7 +47,7 @@
 .gh-contentfilter-menu-trigger:focus,
 .gh-contentfilter-menu-trigger--active {
     background: var(--white);
-    font-size: 1.3rem;
+    font-size: 1.35rem;
     font-weight: 400;
     color: var(--darkgrey);
     letter-spacing: 0.2px;
@@ -98,7 +98,7 @@
     margin-top: 6px;
     padding: 6px 0;
     border: none !important;
-    font-size: 1.3rem;
+    font-size: 1.35rem;
     box-shadow: 0 0 0 1px rgba(0,0,0,.04), 0 7px 20px -5px rgba(0,0,0,.15);
     border-radius: 5px !important;
 }
diff --git a/ghost/admin/app/styles/layouts/main.css b/ghost/admin/app/styles/layouts/main.css
index b8985d55f6..7d80fbbe67 100644
--- a/ghost/admin/app/styles/layouts/main.css
+++ b/ghost/admin/app/styles/layouts/main.css
@@ -264,7 +264,7 @@
 
 .gh-nav-search-icon path {
     stroke: none !important;
-    fill: var(--lightgrey);
+    fill: var(--midgrey);
 }
 
 .gh-search-tips {
@@ -1059,7 +1059,27 @@
 .view-actions input[type="text"] {
     padding: 8px 8px 9px;
     height: 35px;
-    font-size: 1.3rem;
+    font-size: 1.35rem;
+}
+
+.view-actions .gh-btn {
+    border: none;
+    box-shadow: none;
+}
+
+.view-actions .gh-btn:hover {
+    background: var(--whitegrey);
+}
+
+.view-actions .gh-btn-icon-only {
+    border: none;
+}
+
+.view-actions .gh-btn-icon-only svg {
+    height: 18px;
+    width: 18px;
+    fill: var(--black);
+    margin-right: 0;
 }
 
 .view-actions .gh-input-search-icon {
@@ -1076,9 +1096,9 @@
 }
 
 .gh-actions-cog svg {
-    height: 13px;
-    width: 13px;
-    fill: var(--midgrey);
+    height: 18px;
+    width: 18px;
+    fill: var(--black);
     margin-right: 0;
 }
 
diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css
index 0c19009bce..51243fdfc3 100644
--- a/ghost/admin/app/styles/layouts/members.css
+++ b/ghost/admin/app/styles/layouts/members.css
@@ -51,7 +51,6 @@
 
 .members-list {
     table-layout: fixed;
-    margin-top: var(--main-area-padding);
 }
 
 .members-list .gh-list-row.header {
@@ -92,21 +91,16 @@
 
 .members-header .view-actions input.gh-members-list-searchfield {
     min-width: 220px;
-    padding-left: 30px;
-    border-bottom-left-radius: 0;
-    border-top-left-radius: 0;
+    padding-left: 32px;
+    border: none;
+    background: var(--whitegrey-l1);
 }
 
 .members-header .view-actions .gh-input-search-icon {
-    width: 14px;
-    height: 14px;
-    top: 10px;
-    left: 10px;
-}
-
-.dropdown-topmenu .gh-contentfilter-menu-trigger {
-    border-top-left-radius: 4px !important;
-    border-bottom-left-radius: 4px !important;
+    width: 16px;
+    height: 16px;
+    top: 9px;
+    left: 9px;
 }
 
 .gh-members-list-searchfield.active {
@@ -161,9 +155,11 @@ p.gh-members-list-email {
 }
 
 .members-header .gh-members-header-search {
-    margin-right: 12px;
-    border-right: 1px solid var(--lightgrey-d2);
-    padding-right: 12px;
+    margin-right: 32px;
+}
+
+.gh-members-chart {
+    padding-bottom: var(--main-area-padding);
 }
 
 .gh-members-chart-box {
diff --git a/ghost/admin/app/styles/patterns/buttons.css b/ghost/admin/app/styles/patterns/buttons.css
index 5656b93285..abfb197790 100644
--- a/ghost/admin/app/styles/patterns/buttons.css
+++ b/ghost/admin/app/styles/patterns/buttons.css
@@ -25,8 +25,8 @@
     display: block;
     overflow: hidden;
     padding: 0 11px;
-    height: 35px;
-    font-size: 1.3rem;
+    height: 33px;
+    font-size: 1.35rem;
     line-height: 33px;
     font-weight: 500;
     text-align: center;
@@ -115,7 +115,7 @@ fieldset[disabled] .gh-btn {
 /* ---------------------------------------------------------- */
 .gh-btn-primary,
 .gh-btn-primary:hover {
-    background: var(--black);
+    background: var(--black) !important;
     border: none;
     color: var(--white);
     font-weight: 600;
@@ -490,7 +490,6 @@ Usage: CTA buttons grouped together horizontally.
     margin: 0;
     background: none;
     box-shadow: none;
-    min-width: 120px;
     margin: 2px;
     border-radius: 2px;
 }
diff --git a/ghost/admin/app/templates/members.hbs b/ghost/admin/app/templates/members.hbs
index 9dcba59205..7e25e25111 100644
--- a/ghost/admin/app/templates/members.hbs
+++ b/ghost/admin/app/templates/members.hbs
@@ -26,7 +26,7 @@
 
             <span class="dropdown">
                 <GhDropdownButton @dropdownName="members-actions-menu"
-                    @classNames="gh-btn gh-btn-white gh-btn-icon only-has-icon gh-actions-cog" @title="Members Actions"
+                    @classNames="gh-btn gh-btn-icon only-has-icon gh-actions-cog" @title="Members Actions"
                     @data-test-user-actions="true">
                     <span>
                         {{svg-jar "settings"}}