diff --git a/ghost/admin/app/components/editor-labs/publish-management.js b/ghost/admin/app/components/editor-labs/publish-management.js index 4082f04f4c..93b7c6e297 100644 --- a/ghost/admin/app/components/editor-labs/publish-management.js +++ b/ghost/admin/app/components/editor-labs/publish-management.js @@ -29,16 +29,16 @@ export class PublishOptions { return [{ value: 'publish+send', label: 'Publish and email', - display: 'published and sent', + display: 'Publish and email', disabled: this.emailDisabled }, { value: 'publish', label: 'Publish only', - display: 'published' + display: 'Publish on site' }, { value: 'send', label: 'Email only', - display: 'sent', + display: 'Send email', disabled: this.emailDisabled }]; } diff --git a/ghost/admin/app/components/modals/editor-labs/publish-flow.hbs b/ghost/admin/app/components/modals/editor-labs/publish-flow.hbs index ca7e24ccca..f8948a1804 100644 --- a/ghost/admin/app/components/modals/editor-labs/publish-flow.hbs +++ b/ghost/admin/app/components/modals/editor-labs/publish-flow.hbs @@ -6,62 +6,65 @@
-
Ready?
+
Another masterpiece. Ready to share it with the world?
- Right now - - , this {{@data.publishOptions.post.displayName}} will be - +
+ {{svg-jar "send-email"}} {{#if @data.publishOptions.emailUnavailable}} - published + publish {{else}} - - - {{@data.publishOptions.selectedPublishTypeOption.display}} - - -
- {{#each @data.publishOptions.publishTypeOptions as |option|}} -
- - -
- {{/each}} -
-
-
+ + + {{@data.publishOptions.selectedPublishTypeOption.display}} + + +
+ {{#each @data.publishOptions.publishTypeOptions as |option|}} +
+ + +
+ {{/each}} +
+
+
{{/if}} +
- {{#if (eq @data.publishOptions.publishType "publish")}} - on your site. - {{else}} - to - all subscribers - - of - - {{#if @data.publishOptions.onlyDefaultNewsletter}} - your site. - {{else}} - The Weekly Roundup. - {{/if}} - {{/if}} + {{#unless (eq @data.publishOptions.publishType "publish")}} +
+ {{svg-jar "member"}} +
+ 235 + {{#unless @data.publishOptions.onlyDefaultNewsletter}} + + Charts of the Week + + {{/unless}} + subscribers +
+
+ {{/unless}} +
+ {{svg-jar "clock"}} +
Right now
+
diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css index 94ff07fbc9..06a0646caf 100644 --- a/ghost/admin/app/styles/components/publishmenu.css +++ b/ghost/admin/app/styles/components/publishmenu.css @@ -455,36 +455,60 @@ display: flex; flex-direction: column; height: 100%; - width: 740px; + width: 640px; margin: 0 auto 8rem; padding-top: 11vw; } .gh-publish-title { - margin-bottom: 3.6rem; + margin-bottom: 4.6rem; color: var(--black); - font-size: 3.2rem; + font-size: 3.6rem; font-weight: 700; + line-height: 1.3em; +} + +.gh-publish-title span { + background: linear-gradient(135deg,#34b743 5%,#24db39); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; } .gh-publish-settings { - margin-bottom: 4.8rem; - color: var(--black); - font-size: 2.3rem; - font-weight: 400; - line-height: 2em; + margin-bottom: 6rem; + width: 100%; } .gh-publish-setting { - display: inline-flex; + display: flex; align-items: center; - height: 38px; - padding: 0 8px; - font-weight: 600; - white-space: nowrap; + margin-bottom: 1.6rem; +} + +.gh-publish-setting svg { + width: 2rem; + height: 2rem; + margin-right: 1.6rem; +} + +.gh-publish-setting svg path { + stroke: var(--black); + stroke-width: 2px; +} + +.gh-publish-setting-trigger { + width: max-content; + border-bottom: 1.5px solid var(--black); + color: var(--black); + font-size: 2rem; + font-weight: 500; + line-height: 1.35em; cursor: pointer; - background: var(--whitegrey-l1); - border-radius: var(--border-radius); +} + +.gh-publish-setting span { + border-bottom: 0; + font-weight: 700; } .gh-publish-setting input[type="radio"]:disabled + label { diff --git a/ghost/admin/public/assets/icons/clock.svg b/ghost/admin/public/assets/icons/clock.svg index d2ccba163e..bbef4317b6 100644 --- a/ghost/admin/public/assets/icons/clock.svg +++ b/ghost/admin/public/assets/icons/clock.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/member.svg b/ghost/admin/public/assets/icons/member.svg index d9c22fbc09..828e46494c 100644 --- a/ghost/admin/public/assets/icons/member.svg +++ b/ghost/admin/public/assets/icons/member.svg @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/ghost/admin/public/assets/icons/send-email.svg b/ghost/admin/public/assets/icons/send-email.svg index 01f192a2f2..811a8bbcea 100644 --- a/ghost/admin/public/assets/icons/send-email.svg +++ b/ghost/admin/public/assets/icons/send-email.svg @@ -1 +1 @@ -send-email \ No newline at end of file + \ No newline at end of file