From 71ded80e8cdefd876d30955a2a64cceafca5ef22 Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Thu, 7 Nov 2019 15:49:49 +0700
Subject: [PATCH] Refined disabled states more

---
 .../app/styles/components/settings-menu.css   | 11 +++---
 .../components/gh-publishmenu-draft.hbs       | 36 +++++++++----------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/ghost/admin/app/styles/components/settings-menu.css b/ghost/admin/app/styles/components/settings-menu.css
index 7f88e48870..7d8e32cc86 100644
--- a/ghost/admin/app/styles/components/settings-menu.css
+++ b/ghost/admin/app/styles/components/settings-menu.css
@@ -109,8 +109,8 @@
 /* Content
 /* ---------------------------------------------------------- */
 
-.settings-menu-container:not(.ember-power-select-multiple-trigger):not(.tag-settings) input,
-.settings-menu-container:not(.tag-settings) .gh-input,
+.settings-menu-container:not(.ember-power-select-multiple-trigger):not(.tag-settings) input:not([disabled]),
+.settings-menu-container:not(.tag-settings) .gh-input:not([disabled]),
 .settings-menu-pane .gh-date-time-picker-date,
 .settings-menu-pane .gh-date-time-picker-time {
     background: var(--white);
@@ -321,15 +321,16 @@
 .settings-menu-mailgun-warning {
     border-radius: 5px;
     padding: 8px 12px;
-    background: var(--yellow);
-    color: #fff;
+    background: rgba(254, 205, 53, 0.1);
+    color: color-mod(var(--yellow) l(-8%) s(+10%));
+    border: 1px solid var(--yellow);
     font-size: 13px;
     font-weight: 500;
 }
 
 .settings-menu-mailgun-warning a {
     text-decoration: underline;
-    color: #fff;
+    color: color-mod(var(--yellow) l(-8%) s(+10%));
 }
 
 .settings-menu-email .disabled button,
diff --git a/ghost/admin/app/templates/components/gh-publishmenu-draft.hbs b/ghost/admin/app/templates/components/gh-publishmenu-draft.hbs
index c5a7abf854..49f7d2b6ca 100644
--- a/ghost/admin/app/templates/components/gh-publishmenu-draft.hbs
+++ b/ghost/admin/app/templates/components/gh-publishmenu-draft.hbs
@@ -24,30 +24,28 @@
             <div class="gh-publishmenu-radio-desc">Set automatic future publish date</div>
         </div>
     </div>
-    {{#if (and this.feature.labs.members (eq this.post.displayName "post") (not mailgunError))}}
+    {{#if (and this.feature.labs.members (eq this.post.displayName "post") (not mailgunError) (not this.deliveredAction))}}
         <div class="gh-publishmenu-radio">
             {{#if this.backgroundLoader.isRunning}}
                 <div class="gh-loading-spinner" style="zoom: 50%"></div>
             {{else}}
-                {{#unless this.deliveredAction}}
-                    <div class="for-checkbox {{if disableEmailOption "pe-none"}}">
-                        <div class="checkbox" for="email-when-published-checkbox">
-                            <Input @checked={{this.sendEmailWhenPublished}} @type="checkbox" @id="email-when-published-checkbox" @name="email-when-published" @disabled={{disableEmailOption}} />
-                            <span
-                                class="input-toggle-component gh-publishmenu-email-checkbox"
-                                {{on "click" (toggle "sendEmailWhenPublished" this)}}
-                            ></span>
-                        </div>
+                <div class="for-checkbox {{if disableEmailOption "pe-none"}}">
+                    <div class="checkbox" for="email-when-published-checkbox">
+                        <Input @checked={{this.sendEmailWhenPublished}} @type="checkbox" @id="email-when-published-checkbox" @name="email-when-published" @disabled={{disableEmailOption}} />
+                        <span
+                            class="input-toggle-component gh-publishmenu-email-checkbox"
+                            {{on "click" (toggle "sendEmailWhenPublished" this)}}
+                        ></span>
                     </div>
-                    <div class="gh-publishmenu-email-label {{if disableEmailOption "pe-none"}}">
-                        <label class="gh-publishmenu-radio-label" for="email-when-published-checkbox">Email post</label>
-                        {{#if this.memberCount}}
-                            <div class="gh-publishmenu-radio-desc">Send post to members when published</div>
-                        {{else}}
-                            <div class="gh-publishmenu-radio-desc">You haven't got any members</div>
-                        {{/if}}
-                    </div>
-                {{/unless}}
+                </div>
+                <div class="gh-publishmenu-email-label {{if disableEmailOption "pe-none"}}">
+                    <label class="gh-publishmenu-radio-label" for="email-when-published-checkbox">Email post</label>
+                    {{#if this.memberCount}}
+                        <div class="gh-publishmenu-radio-desc">Send post to members when published</div>
+                    {{else}}
+                        <div class="gh-publishmenu-radio-desc">You haven't got any members</div>
+                    {{/if}}
+                </div>
             {{/if}}
         </div>
     {{/if}}