diff --git a/ghost/admin/app/components/gh-publishmenu-draft.hbs b/ghost/admin/app/components/gh-publishmenu-draft.hbs index 09de17657d..9aec50e80a 100644 --- a/ghost/admin/app/components/gh-publishmenu-draft.hbs +++ b/ghost/admin/app/components/gh-publishmenu-draft.hbs @@ -31,37 +31,48 @@ {{#if (and this.canSendEmail showSendEmail)}}
-
+
{{#if this.backgroundLoader.isRunning}}
{{else}}
-
-
{{/if}} diff --git a/ghost/admin/app/components/gh-publishmenu-scheduled.hbs b/ghost/admin/app/components/gh-publishmenu-scheduled.hbs index 97378af904..eea7ec31f5 100644 --- a/ghost/admin/app/components/gh-publishmenu-scheduled.hbs +++ b/ghost/admin/app/components/gh-publishmenu-scheduled.hbs @@ -31,35 +31,45 @@ {{#if (and canSendEmail showSendEmail)}} {{#unless this.post.email}}
-
+
{{#if this.backgroundLoader.isRunning}}
{{else}}
- -
- - + +
+
+

Free members

+
+ +
+
+
+

Paid members

+
+ +
+
{{/if}} diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css index e7eda04159..68de021ff5 100644 --- a/ghost/admin/app/styles/components/publishmenu.css +++ b/ghost/admin/app/styles/components/publishmenu.css @@ -257,16 +257,38 @@ color: var(--midgrey); } +.gh-publishmenu-send-to-option { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; +} + +.gh-publishmenu-send-to-option p { + color: var(--darkgrey); + margin: 0; +} + +.gh-publishmenu-send-to-option .for-switch { + line-height: 1; +} + +.gh-publishmenu-send-to-option .for-switch label { + margin: 0; + width: 38px !important; + height: 22px !important; +} + .gh-publishmenu-emailcount { color: var(--midlightgrey); } .gh-publishmenu-checkbox-disabled { color: var(--midlightgrey); - opacity: 0.75; + opacity: 0.6; pointer-events: none; } .gh-publishmenu-checkbox-disabled p { - color: var(--midlightgrey) !important; -} \ No newline at end of file + color: var(--midgrey) !important; +}