diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs index 8e1d632020..1233bbcde1 100644 --- a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs +++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs @@ -1,41 +1,8 @@ {{#let @publishOptions.post as |post|}}
- ...aand it's out there. - Now that's something to smile about. + Boom. It’s out there. That’s 391 posts published, keep going!
-

- {{#if post.isScheduled}} - {{#let (moment-site-tz post.publishedAtUTC) as |scheduledAt|}} - On - - {{moment-format scheduledAt "D MMM YYYY"}} - at - {{moment-format scheduledAt "HH:mm"}} - - your - {{/let}} - {{else}} - Your - {{/if}} - - {{post.displayName}} is - - {{#if post.email}} - on its way to - - {{pluralize post.email.emailCount "member"}} - - and was - - {{#if post.emailOnly}} - not - {{/if}} - {{/if}} - - published on your site. -

-
{{#unless post.emailOnly}} diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs index 12c98d112d..2a83c49f93 100644 --- a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs +++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs @@ -19,8 +19,14 @@ {{@publishOptions.post.displayName}} + {{#if @publishOptions.willPublish}} + will be published on your site{{#if @publishOptions.willEmail}}, and delivered to{{else}}.{{/if}} + {{/if}} + {{#if @publishOptions.willEmail}} - will be delivered to + {{#unless @publishOptions.willPublish}} + will be delivered to + {{/unless}} {{#let (members-count-fetcher query=(hash filter=@publishOptions.fullRecipientFilter)) as |countFetcher|}} @@ -36,22 +42,16 @@ {{gh-pluralize countFetcher.count "member" without-count=true}} {{else}} {{gh-pluralize countFetcher.count "subscriber" without-count=true}} - of {{@publishOptions.newsletter.name}} + of {{@publishOptions.newsletter.name}}{{#if @publishOptions.willPublish}}.{{else}},{{/if}} {{/if}} {{/let}} - {{#if @publishOptions.willPublish}} - and - {{else}} + {{#unless @publishOptions.willPublish}} and will not be published on your site. - {{/if}} + {{/unless}} {{/if}} - {{#if @publishOptions.willPublish}} - will be published on your site. - {{/if}} - - Are you good to go? + This is it.

@@ -62,8 +62,5 @@ @successText={{if @publishOptions.willOnlyEmail "Sent" "Published"}} @class="gh-btn gh-btn-pulse gh-btn-large" /> -
- Or - -
+
\ No newline at end of file diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs index 6e39303313..0cd77f66a9 100644 --- a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs +++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs @@ -108,9 +108,6 @@
- -
- Or - -
+ +
\ No newline at end of file diff --git a/ghost/admin/app/components/editor-labs/modals/update-flow.hbs b/ghost/admin/app/components/editor-labs/modals/update-flow.hbs index 1d967cc33a..381fda39b9 100644 --- a/ghost/admin/app/components/editor-labs/modals/update-flow.hbs +++ b/ghost/admin/app/components/editor-labs/modals/update-flow.hbs @@ -1,25 +1,23 @@
{{#let @data.publishOptions.post as |post|}} -
+
This {{post.displayName}} is - {{post.status}} + {{post.status}}
-

+

{{#let (moment-site-tz post.publishedAtUTC) as |publishedAt|}} On - {{moment-format publishedAt "D MMM YYYY"}} at {{moment-format publishedAt "HH:mm"}} - your {{/let}} diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs b/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs index 902143b608..d0fa4b5f82 100644 --- a/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs +++ b/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs @@ -7,7 +7,7 @@

- +
{{#if @publishOptions.isScheduled}} diff --git a/ghost/admin/app/components/gh-date-time-picker.hbs b/ghost/admin/app/components/gh-date-time-picker.hbs index 5b49c4a1fe..cb5c2706c0 100644 --- a/ghost/admin/app/components/gh-date-time-picker.hbs +++ b/ghost/admin/app/components/gh-date-time-picker.hbs @@ -35,7 +35,7 @@ {{did-insert this.registerTimeInput}} data-test-date-time-picker-time-input > - ({{this.timezone}}) + {{this.timezone}}
{{#if this.hasError}} diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css index fdb5e9f5b0..c31b960421 100644 --- a/ghost/admin/app/styles/components/publishmenu.css +++ b/ghost/admin/app/styles/components/publishmenu.css @@ -461,10 +461,10 @@ .gh-publish-title { margin: 2px 0 4rem; color: var(--black); - font-size: 4.8rem; + font-size: 4.6rem; font-weight: 700; letter-spacing: -.017em; - line-height: 1.1em; + line-height: 1.2em; } .gh-publish-settings { @@ -553,12 +553,39 @@ } .gh-publish-setting-form.last fieldset { + display: flex; margin-bottom: 0; } +.gh-publish-newsletter-trigger { + padding: 8px 16px; + font-size: 1.45rem; +} + +.gh-publish-newsletter-trigger svg { + position: absolute; + top: 50%; + right: 16px; +} + +.gh-publish-newsletter-dropdown { + z-index: 99999; + padding: 4px 0; +} + +.gh-publish-newsletter-dropdown .ember-power-select-option { + padding: 8px 16px; +} + +.gh-publish-newsletter-dropdown .ember-power-select-option[aria-selected="true"] { + color: var(--black); + font-weight: 600; +} + .gh-publish-types, .gh-publish-schedule { display: flex; + flex-shrink: 0; margin: 0; } @@ -598,29 +625,44 @@ color: var(--middarkgrey-d1); } -.gh-publish-newsletter-trigger { - padding: 8px 16px; - font-size: 1.45rem; +.gh-publish-schedule .gh-radio { + margin: 0; } -.gh-publish-newsletter-trigger svg { - position: absolute; - top: 50%; - right: 16px; +.gh-publish-setting-form .gh-date-time-picker { + display: grid; + grid-template-columns: 1fr 1fr; + grid-gap: 12px; } -.gh-publish-newsletter-dropdown { - z-index: 99999; - padding: 4px 0; +.gh-publish-setting-form .gh-date-time-picker-date { + height: 40px; + margin: 0; + padding: 8px 12px; + font-size: 1.4rem; } -.gh-publish-newsletter-dropdown .ember-power-select-option { - padding: 8px 16px; +.gh-publish-setting-form .gh-date-time-picker-date svg path, +.gh-publish-setting-form .gh-date-time-picker-date svg rect { + fill: none; + stroke: var(--midgrey); + stroke-linecap: round; + stroke-linejoin: round; + stroke-width: 2px } -.gh-publish-newsletter-dropdown .ember-power-select-option[aria-selected="true"] { - color: var(--black); - font-weight: 600; +.gh-publish-setting-form .gh-date-time-picker-time { + width: unset; + height: 40px; + margin: 0; + padding: 8px 12px; + font-size: 1.4rem; +} + +.gh-publish-setting-form .gh-date-time-picker-timezone { + margin: 0; + color: var(--midgrey); + font-weight: 500; } .gh-publish-cta { @@ -629,6 +671,10 @@ width: max-content; } +.gh-update-flow .gh-publish-cta { + flex-direction: row; +} + .gh-publish-cta .gh-btn { width: max-content; } diff --git a/ghost/admin/public/assets/icons/calendar.svg b/ghost/admin/public/assets/icons/calendar.svg index ee6ebea17d..a0a56237ed 100644 --- a/ghost/admin/public/assets/icons/calendar.svg +++ b/ghost/admin/public/assets/icons/calendar.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + \ No newline at end of file