From eafd2f901eb694cd3b1508bc0b974319b89205ac Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Thu, 12 May 2022 13:30:14 +0100
Subject: [PATCH] Updated publishing flow email recipient filters

Refs https://github.com/TryGhost/Team/issues/1544
---
 .../gh-members-recipient-select.hbs           | 40 +++++++++----------
 .../app/styles/components/publishmenu.css     | 14 ++-----
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/ghost/admin/app/components/gh-members-recipient-select.hbs b/ghost/admin/app/components/gh-members-recipient-select.hbs
index 2a20313061..d60c6ec493 100644
--- a/ghost/admin/app/components/gh-members-recipient-select.hbs
+++ b/ghost/admin/app/components/gh-members-recipient-select.hbs
@@ -1,4 +1,4 @@
-<div class="gh-publish-send-to">
+<div class="gh-publish-send-to {{if this.isSpecificChecked "mb4"}}">
     <div class="gh-publish-send-to-option">
         <div class="for-checkbox {{if @disabled "disabled"}}">
             <label class="checkbox" for="send-email-to-free">
@@ -71,27 +71,27 @@
                     >
                     <div class="flex">
                         <span class="input-toggle-component"></span>
-                        <p>Other</p>
+                        <p>Specific people</p>
                     </div>
                 </label>
             </div>
         </div>
-        {{#if this.isSpecificChecked}}
-            <GhTokenInput
-                @class="select-members select-members-recipient"
-                @dropdownClass={{@dropdownClass}}
-                @options={{this.specificOptions}}
-                @selected={{this.selectedSpecificOptions}}
-                @disabled={{@disabled}}
-                @searchMessage="All labels selected"
-                @optionsComponent="power-select/options"
-                @allowCreation={{false}}
-                @renderInPlace={{this.renderInPlace}}
-                @onChange={{this.selectSpecificOptions}}
-                as |option|
-            >
-                {{option.name}}
-            </GhTokenInput>
-        {{/if}}
     {{/if}}
-</div>
\ No newline at end of file
+</div>
+{{#if this.isSpecificChecked}}
+    <GhTokenInput
+        @class="select-members select-members-recipient"
+        @dropdownClass={{@dropdownClass}}
+        @options={{this.specificOptions}}
+        @selected={{this.selectedSpecificOptions}}
+        @disabled={{@disabled}}
+        @searchMessage="All labels selected"
+        @optionsComponent="power-select/options"
+        @allowCreation={{false}}
+        @renderInPlace={{this.renderInPlace}}
+        @onChange={{this.selectSpecificOptions}}
+        as |option|
+    >
+        {{option.name}}
+    </GhTokenInput>
+{{/if}}
\ No newline at end of file
diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 8ff9c39d48..023f4e76b5 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -331,7 +331,6 @@
 
 .gh-publish-send-to {
     display: flex;
-    height: 38px;
 }
 
 .gh-publish-send-to-option {
@@ -361,8 +360,8 @@
     top: calc(50%-9px);
     left: 14px;
     margin: 0;
-    border-color: var(--white);
-    background: var(--white);
+    border-color: transparent;
+    background: transparent;
 }
 
 .gh-publish-send-to-option label p {
@@ -392,8 +391,8 @@
 }
 
 .gh-publish-send-to-option .for-checkbox input:checked + .flex .input-toggle-component {
-    border: 1px solid var(--white);
-    background: var(--white);
+    border-color: transparent;
+    background: transparent;
 }
 
 .gh-publish-send-to-option .for-checkbox .input-toggle-component::before {
@@ -406,11 +405,6 @@
     border-color: var(--black);
 }
 
-.gh-publish-send-to .ember-power-select-multiple-trigger {
-    flex-grow: 1;
-    padding: 3px;
-}
-
 .gh-publish-emailcount {
     margin-left: 4px;
     font-size: 1.3rem;