diff --git a/ghost/admin/app/components/settings/members-email.hbs b/ghost/admin/app/components/settings/members-email.hbs index e99946d5e4..f623802a33 100644 --- a/ghost/admin/app/components/settings/members-email.hbs +++ b/ghost/admin/app/components/settings/members-email.hbs @@ -1,121 +1,210 @@ -
-
-
-
-
-

Enable newsletter sending

-

Newsletter features are active, posts can be sent by email

-
-
- -
-
-
-
-
- -{{#if this.emailNewsletterEnabled}} - -
+{{#if (feature "multipleNewsletters")}} +
-

Email design

-

Customize the look and feel of your newsletters

+

Enable newsletter sending

+

Newsletter features are active, posts can be sent by email

+
+
+
-
-
+ {{#if this.emailNewsletterEnabled}} +
+

Newsletters

+
+
+
+
+

+ Daily roundup +

+

+ Daily news delivered to your inbox every morning. +

+
+
+
+

19

+

Subscribers

+
+
+

17

+

Posts sent

+
+
+
+ + + + {{svg-jar "dotdotdot"}} + + + + +
  • + +
  • +
  • + +
  • +
    +
    +
    +
    -
    -
    +
    +
    +

    + Weekly summary +

    +

    + Get the weekly highlights every Sunday. +

    +
    +
    +
    +

    32

    +

    Subscribers

    +
    +
    +

    2

    +

    Posts sent

    +
    +
    +
    + + + + {{svg-jar "dotdotdot"}} + + + + +
  • + +
  • +
  • + +
  • +
    +
    +
    +
    +
    +
    + +
    + +
    +

    General settings

    -
    +

    Default newsletter recipients

    When you publish new content, who do you usually want to send it to?

    +
    -
    -
    -
    -
    -
    -
    -

    Email addresses

    -

    Contact information used for newsletters and member login emails

    -
    - -
    -
    - {{#liquid-if this.membersFromOpen}} + + {{#unless this.config.mailgunIsConfigured}} +
    +
    - - -
    - - -
    -

    The address your newsletter posts are sent from

    -
    - {{#if this.showFromAddressConfirmation}} -
    - {{svg-jar "check-circle" class="w4 h4 mr1 stroke-green-d1"}} Check your inbox and confirm before saving your settings -
    - {{/if}} +

    Mailgun configuration

    +

    The Mailgun API is used for bulk email newsletter delivery. Why is this required?

    - - - - {{one-way-select this.selectedReplyAddress - id="reply-address" - name="reply-address" - options=(readonly this.replyAddresses) - optionValuePath="value" - optionLabelPath="label" - update=(action "setReplyAddress") - }} - {{svg-jar "arrow-down-small"}} - -
    -

    Where you receive responses to newsletters

    - {{#if (eq this.settings.membersReplyAddress "support")}} - Change support email address - {{/if}} + +
    +
    + {{#liquid-if this.membersEmailOpen}} +
    + +
    + + +
    + + {{region.flag}} {{region.name}} + +
    +
    + + + + +
    +

    Find your Mailgun region and domain + here +

    +
    + + + +

    Find your Mailgun API keys + here +

    +
    - - {{/liquid-if}} + {{/liquid-if}} +
    -
    -
    -
    + {{/unless}} +
    @@ -131,116 +220,253 @@
    -
    -
    -

    Preview

    -
    -
    -
    Ready to {{#if this.emailPreviewVisible}} publish & send {{else}} publish {{/if}}{{svg-jar "arrow-down"}} this post?
    -
    -
    -
    -
    -
    -
    Set it live now
    -
    -
    -
    -
    -
    -
    Schedule it for later
    -
    -
    -
    - {{#if this.emailPreviewVisible}} -
    -
    -
    - -
    - -
    -
    -
    -
    - {{/if}} -
    +
    + {{/if}} +{{else}} +
    +
    +
    +
    +
    +

    Enable newsletter sending

    +

    Newsletter features are active, posts can be sent by email

    +
    +
    + +
    - {{#unless this.config.mailgunIsConfigured}} -
    -
    -

    Advanced

    + {{#if this.emailNewsletterEnabled}} + +
    -

    Mailgun configuration

    -

    The Mailgun API is used for bulk email newsletter delivery. Why is this required?

    +

    Email design

    +

    Customize the look and feel of your newsletters

    - -
    -
    - {{#liquid-if this.membersEmailOpen}} -
    - -
    - - -
    - - {{region.flag}} {{region.name}} - -
    -
    - - - - -
    -

    Find your Mailgun region and domain - here -

    -
    - - - -

    Find your Mailgun API keys - here -

    -
    -
    - {{/liquid-if}} +
    - {{/unless}} +
    + +
    +
    +
    +
    +
    +
    +

    Default newsletter recipients

    +

    When you publish new content, who do you usually want to send it to?

    +
    +
    + +
    +
    +
    +
    +
    +
    +

    Email addresses

    +

    Contact information used for newsletters and member login emails

    +
    + +
    +
    + {{#liquid-if this.membersFromOpen}} +
    + + +
    + + +
    +

    The address your newsletter posts are sent from

    +
    + {{#if this.showFromAddressConfirmation}} +
    + {{svg-jar "check-circle" class="w4 h4 mr1 stroke-green-d1"}} Check your inbox and confirm before saving your settings +
    + {{/if}} +
    + + + + {{one-way-select this.selectedReplyAddress + id="reply-address" + name="reply-address" + options=(readonly this.replyAddresses) + optionValuePath="value" + optionLabelPath="label" + update=(action "setReplyAddress") + }} + {{svg-jar "arrow-down-small"}} + +
    +

    Where you receive responses to newsletters

    + {{#if (eq this.settings.membersReplyAddress "support")}} + Change support email address + {{/if}} +
    +
    + {{/liquid-if}} +
    +
    +
    +
    +
    +
    +
    +

    Enable newsletter open-rate

    +

    Track how many members are reading your emails

    +
    +
    + +
    +
    +
    +
    +
    +
    +

    Preview

    +
    +
    +
    Ready to {{#if this.emailPreviewVisible}} publish & send {{else}} publish {{/if}}{{svg-jar "arrow-down"}} this post?
    +
    +
    +
    +
    +
    +
    Set it live now
    +
    +
    +
    +
    +
    +
    Schedule it for later
    +
    +
    +
    + {{#if this.emailPreviewVisible}} +
    +
    +
    + +
    + +
    +
    +
    +
    + {{/if}} +
    +
    +
    +
    +
    + + {{#unless this.config.mailgunIsConfigured}} +
    +
    +

    Advanced

    +
    +
    +
    +
    +

    Mailgun configuration

    +

    The Mailgun API is used for bulk email newsletter delivery. Why is this required?

    +
    + +
    +
    + {{#liquid-if this.membersEmailOpen}} +
    + +
    + + +
    + + {{region.flag}} {{region.name}} + +
    +
    + + + + +
    +

    Find your Mailgun region and domain + here +

    +
    + + + +

    Find your Mailgun API keys + here +

    +
    +
    + {{/liquid-if}} +
    +
    +
    +
    + {{/unless}} + + {{/if}} {{/if}} \ No newline at end of file diff --git a/ghost/admin/app/styles/layouts/products.css b/ghost/admin/app/styles/layouts/products.css index 09a31afdfe..85a9674dbf 100644 --- a/ghost/admin/app/styles/layouts/products.css +++ b/ghost/admin/app/styles/layouts/products.css @@ -226,7 +226,14 @@ } .gh-btn-add-product svg { - margin-right: 2px; + width: 1rem; + height: 1rem; + margin: 1px 4px 0 0; +} + +.gh-btn-icon.gh-btn-add-product svg path { + stroke: var(--green-d1); + stroke-width: 3; } .gh-product-list-icon { diff --git a/ghost/admin/app/styles/layouts/settings.css b/ghost/admin/app/styles/layouts/settings.css index f18a09672f..dd0ed42a13 100644 --- a/ghost/admin/app/styles/layouts/settings.css +++ b/ghost/admin/app/styles/layouts/settings.css @@ -881,6 +881,120 @@ } +/* Email newsletter LABS +/* ---------------------------------------------------------- */ + +.gh-newsletters .intro { + margin-bottom: 2rem; +} + +.gh-newsletters .gh-expandable-title { + font-size: 1.5rem; + font-weight: 600; + color: var(--black); + margin: 0; + padding: 0; +} + +.gh-newsletters .gh-expandable-description { + margin: 0; + padding: 0; + color: var(--darkgrey); + font-size: 1.4rem; + font-weight: 400; +} + +.gh-newsletters .gh-expandable-block { + padding: 24px; +} + +.gh-newsletters .gh-main-content-card:last-of-type { + margin-bottom: 0; +} + +.gh-newsletter-card { + position:relative; + display: flex; + align-items: flex-start; + justify-content: space-between; +} + +@media (max-width: 980px) { + .gh-newsletter-card { + padding: 4vmin 48px; + } +} + +.gh-newsletter-card-block.stats-block { + display: grid; + flex-basis: 30%; + grid-template-columns: 1fr 1fr; + margin-right: 4.4rem; +} + +.gh-newsletter-card-block.title-block { + flex-basis: 60%; +} + +.gh-newsletter-card-block:not(:first-of-type) { + padding-left: 16px; +} + +.gh-newsletter-card-block h4 { + font-size: 1.3rem; + font-weight: 500; +} + +.gh-newsletter-card-block h4 .counter { + font-weight: 400; + color: var(--midgrey); +} + +.gh-newsletter-card-name { + display: flex; + align-items: center; + margin: 0; + font-size: 1.8rem; + line-height: 1.25em; +} + +.gh-newsletter-card-description { + font-size: 1.3rem; + line-height: 1.45em; + margin: 4px 20px 4px 0; + color: var(--midgrey); +} + +.gh-newsletter-card-button-container { + position: absolute; + right: 24px; + top: 24px; + margin-right: 0; +} + +.gh-newsletter-actions-menu { + top: calc(100% + 6px); + left: auto; + right: 0; +} + +.gh-add-newsletter { + width: max-content; + margin: .8rem 0 0; + color: var(--green-d1); +} + +.gh-add-newsletter svg { + width: 1rem; + height: 1rem; + margin: 1px 4px 0 0; +} + +.gh-add-newsletter svg path { + stroke: var(--green-d1); + stroke-width: 3; +} + /* Code injection /* ---------------------------------------------------------- */