From 738ffa56c4b96a09a564f48fe10f1189ee21b908 Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Mon, 19 Apr 2021 10:20:35 -0700 Subject: [PATCH 1/6] [not verified] Add base styles for mailchimp form --- .../jetpack/extensions/blocks/mailchimp/view.scss | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss index 76182ff31de70..a83a80766d7f7 100644 --- a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss +++ b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss @@ -8,10 +8,21 @@ } } - .wp-block-jetpack-button { + p { margin-bottom: 1em; } + input { + width: 100%; + padding: 14px; + } + + .components-button { + padding: 20px 30px; + border: inherit; + font: inherit; + } + .error, .error:focus { outline: 1px; From be158e0cea2931442f1da90e7dbdfa4e0eb63762 Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Mon, 19 Apr 2021 10:23:10 -0700 Subject: [PATCH 2/6] [not verified] Add changelog --- .../plugins/jetpack/changelog/fix-mailchimp-styling-for-fse | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 projects/plugins/jetpack/changelog/fix-mailchimp-styling-for-fse diff --git a/projects/plugins/jetpack/changelog/fix-mailchimp-styling-for-fse b/projects/plugins/jetpack/changelog/fix-mailchimp-styling-for-fse new file mode 100644 index 0000000000000..dd140e667cd79 --- /dev/null +++ b/projects/plugins/jetpack/changelog/fix-mailchimp-styling-for-fse @@ -0,0 +1,4 @@ +Significance: patch +Type: compat + +Mailchimp block: add base styles to ensure compatibility with WordPress' Full Site Editing feature. From 86bbbdb189b05105dd644094a858b8cfeeecd25e Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Wed, 21 Apr 2021 11:26:24 -0700 Subject: [PATCH 3/6] [not verified] Remove base styles for button The base styles should instead come from the jetpack button (#19595) --- .../plugins/jetpack/extensions/blocks/mailchimp/view.scss | 6 ------ 1 file changed, 6 deletions(-) diff --git a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss index a83a80766d7f7..4bfdc41d8cc59 100644 --- a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss +++ b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss @@ -17,12 +17,6 @@ padding: 14px; } - .components-button { - padding: 20px 30px; - border: inherit; - font: inherit; - } - .error, .error:focus { outline: 1px; From af9ee49d5006e14f5b570bf994264f7fe9a391e0 Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Wed, 21 Apr 2021 11:38:10 -0700 Subject: [PATCH 4/6] [not verified] Remove input padding to prevent overriding theme styles --- projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss index 4bfdc41d8cc59..8b8767b930c73 100644 --- a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss +++ b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss @@ -14,7 +14,6 @@ input { width: 100%; - padding: 14px; } .error, From 3d5aa3489d53b75c5a36e3058cd81d3b052cca6a Mon Sep 17 00:00:00 2001 From: Staci Cooper Date: Wed, 21 Apr 2021 12:04:13 -0700 Subject: [PATCH 5/6] [not verified] Add margin back to bottom of button --- projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss index 8b8767b930c73..f5728372e36ec 100644 --- a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss +++ b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss @@ -8,7 +8,7 @@ } } - p { + .wp-block-jetpack-button, p { margin-bottom: 1em; } From c645b05820903cbc1d6015c563b7a6713688f504 Mon Sep 17 00:00:00 2001 From: Andrew Serong Date: Fri, 23 Apr 2021 14:59:01 +1000 Subject: [PATCH 6/6] [not verified] Add box-sizing so that the width doesn't overflow the container --- projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss index f5728372e36ec..755ae4c6c3170 100644 --- a/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss +++ b/projects/plugins/jetpack/extensions/blocks/mailchimp/view.scss @@ -13,6 +13,7 @@ } input { + box-sizing: border-box; width: 100%; }