diff --git a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs b/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs index 244e852783..641351a7f1 100644 --- a/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs +++ b/ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs @@ -28,14 +28,16 @@ {{#if @newsletter.showPostTitleSection}}

Your email newsletter

-
-

By {{or this.session.user.name this.session.user.email}} on {{moment-format (moment-site-tz) "D MMM YYYY"}}

-
- View in browser +
+

By {{or this.session.user.name this.session.user.email}} + {{moment-format (moment-site-tz) "D MMM YYYY"}} {{#if this.showCommentCta}} - {{svg-jar "comments"}} + {{svg-jar "comments"}} {{/if}} -

+

+

+ View in browser +

{{/if}} diff --git a/ghost/admin/app/styles/layouts/members.css b/ghost/admin/app/styles/layouts/members.css index eda6e612ea..6743986d1b 100644 --- a/ghost/admin/app/styles/layouts/members.css +++ b/ghost/admin/app/styles/layouts/members.css @@ -2056,25 +2056,38 @@ p.gh-members-import-errordetail:first-of-type { padding: 0 0 16px; } +.gh-members-emailpreview-meta { + display: flex; + justify-content: space-between; + width: 100%; + height: 20px; +} + +.gh-members-emailpreview-meta.center-aligned { + flex-direction: column; +} + .gh-members-emailpreview-title p { margin: 0; padding: 0 0 10px; white-space: nowrap; font-size: 1.3rem; line-height: 1; - letter-spacing: 0.2px; + letter-spacing: 0.1px; text-transform: uppercase; text-align: center; color: #15212A; } -.gh-members-emailpreview-meta-center { - text-align: center; -} - -.gh-members-emailpreview-labs .gh-members-emailpreview-title p { +.gh-members-emailpreview-meta p { padding: 0 0 4px; color: var(--midgrey); + text-transform: none; +} + +.gh-members-emailpreview-meta p span::before{ + content: "•"; + padding: 0 4px; } .gh-members-emailpreview-title p span { @@ -2086,17 +2099,17 @@ p.gh-members-import-errordetail:first-of-type { color: #15212A; } -.gh-members-emailpreview-labs .gh-members-emailpreview-title a { - text-decoration: underline; +.gh-members-emailpreview-meta a { + text-decoration: none; color: var(--midgrey); font-size: 1.3rem; line-height: 1; letter-spacing: 0.2px; } -.gh-members-emailpreview-labs .gh-members-emailpreview-title a svg { +.gh-members-emailpreview-meta a svg { display: inline-block; - margin: -2px 0 0 10px; + margin-top: -2px; vertical-align: middle; width: 16px; height: 16px; @@ -2126,6 +2139,10 @@ p.gh-members-import-errordetail:first-of-type { border-bottom: 1px solid #e5eff5; } +.gh-members-emailpreview-content:first-child { + margin-top: 48px; +} + .gh-members-emailpreview-content p { font-family: Georgia, serif; font-size: 1.8rem; @@ -2258,6 +2275,7 @@ p.gh-members-import-errordetail:first-of-type { .gh-members-emailpreview-labs .gh-members-emailpreview-feedback-button { border: 0; font-weight: 600; + white-space: nowrap; } .gh-members-emailpreview-feedback-button svg {