diff --git a/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap b/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap index cc5d7cf83d..1894f17c70 100644 --- a/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap +++ b/ghost/core/test/e2e-api/admin/__snapshots__/email-previews.test.js.snap @@ -322,10 +322,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -782,7 +779,7 @@ exports[`Email Preview API Read can read post email preview with email card and Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "24870", + "content-length": "24766", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -1018,10 +1015,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -1500,7 +1494,7 @@ exports[`Email Preview API Read can read post email preview with fields 4: [head Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "29650", + "content-length": "29546", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -1767,10 +1761,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -2234,7 +2225,7 @@ exports[`Email Preview API Read has custom content transformations for email com Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "24624", + "content-length": "24520", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -2830,10 +2821,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -3311,7 +3299,7 @@ exports[`Email Preview API Read uses the newsletter provided through ?newsletter Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "25407", + "content-length": "25303", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, @@ -3933,10 +3921,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -4414,7 +4399,7 @@ exports[`Email Preview API Read uses the posts newsletter by default 4: [headers Object { "access-control-allow-origin": "http://127.0.0.1:2369", "cache-control": "no-cache, private, no-store, must-revalidate, max-stale=0, post-check=0, pre-check=0", - "content-length": "25407", + "content-length": "25303", "content-type": "application/json; charset=utf-8", "content-version": StringMatching /v\\\\d\\+\\\\\\.\\\\d\\+/, "etag": StringMatching /\\(\\?:W\\\\/\\)\\?"\\(\\?:\\[ !#-\\\\x7E\\\\x80-\\\\xFF\\]\\*\\|\\\\r\\\\n\\[\\\\t \\]\\|\\\\\\\\\\.\\)\\*"/, diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap index 7e6e9e89d0..c38ba19b57 100644 --- a/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap +++ b/ghost/core/test/integration/services/email-service/__snapshots__/batch-sending.test.js.snap @@ -215,10 +215,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -900,10 +897,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -1561,10 +1555,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -2222,10 +2213,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -2883,10 +2871,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -3492,10 +3477,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -4153,10 +4135,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -4444,20 +4423,20 @@ table.body h2 span { -
+ - \\"More -

More like this

+ \\"More +

More like this

-
+ - \\"Less -

Less like this

+ \\"Less +

Less like this

-
+ - \\"Comment\\" -

Comment

+ \\"Comment\\" +

Comment

@@ -4874,10 +4853,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -5165,10 +5141,10 @@ table.body h2 span { -
+ - \\"Comment\\" -

Comment

+ \\"Comment\\" +

Comment

@@ -6931,10 +6907,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -7737,10 +7710,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -8453,10 +8423,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -9169,10 +9136,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -9885,10 +9849,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -10601,10 +10562,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -11317,10 +11275,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -11980,10 +11935,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { diff --git a/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap b/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap index 20df17b251..fecf8d6afa 100644 --- a/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap +++ b/ghost/core/test/integration/services/email-service/__snapshots__/cards.test.js.snap @@ -215,10 +215,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -876,10 +873,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -1537,10 +1531,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { @@ -2733,10 +2724,7 @@ table.body .footer a { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header { diff --git a/ghost/email-service/lib/email-templates/partials/feedback-button.hbs b/ghost/email-service/lib/email-templates/partials/feedback-button.hbs index 352c01f590..57efa82c7a 100644 --- a/ghost/email-service/lib/email-templates/partials/feedback-button.hbs +++ b/ghost/email-service/lib/email-templates/partials/feedback-button.hbs @@ -1,4 +1,4 @@ - + {{buttonText}}

{{t buttonText}}

diff --git a/ghost/email-service/lib/email-templates/partials/styles.hbs b/ghost/email-service/lib/email-templates/partials/styles.hbs index b1e9be7a77..1548134970 100644 --- a/ghost/email-service/lib/email-templates/partials/styles.hbs +++ b/ghost/email-service/lib/email-templates/partials/styles.hbs @@ -510,18 +510,20 @@ figure blockquote p { } .feedback-buttons img { - display: inline-block; + display: block; + margin: 0 auto; vertical-align: middle; } .feedback-button-text { - display: inline; - padding-left: 8px; + display: inline-block; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; color: #15212A; font-size: 13px !important; font-weight: 500; - margin-bottom: 0; + margin: 1em 0 0 0; + line-height: 1.4em; + word-break: break-word; } /* ------------------------------------- @@ -1490,10 +1492,7 @@ a[data-flickr-embed] img { } table.body .feedback-button-text { - display: block !important; - padding-top: 4px !important; - padding-left: 0px !important; - font-size: 13px !important; + display: none!important; } table.body .latest-posts-header {