From 2cfc0454b9a4a2dab59cfd48d11fc7e418bd3a38 Mon Sep 17 00:00:00 2001
From: Jefferson Rabb <jeff@atavist.net>
Date: Wed, 27 Feb 2019 12:39:15 -0500
Subject: [PATCH 1/5] Rework of button UI hierarchy in unconnected placeholder.

---
 client/gutenberg/extensions/mailchimp/edit.jsx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/gutenberg/extensions/mailchimp/edit.jsx b/client/gutenberg/extensions/mailchimp/edit.jsx
index 39cd2bba7f620..534deca662e7f 100644
--- a/client/gutenberg/extensions/mailchimp/edit.jsx
+++ b/client/gutenberg/extensions/mailchimp/edit.jsx
@@ -144,12 +144,13 @@ class MailchimpSubscribeEdit extends Component {
 						'You need to connect your Mailchimp account and choose a list in order to start collecting Email subscribers.'
 					) }
 					<br />
-					<ExternalLink href={ connectURL }>{ __( 'Set up Mailchimp form' ) }</ExternalLink>
 					<br />
-					<br />
-					<Button isDefault onClick={ this.apiCall }>
-						{ __( 'Re-check Connection' ) }
+					<Button isPrimary href={ connectURL } target="_blank">
+						{ __( 'Set up Mailchimp form' ) }
 					</Button>
+					<br />
+					<br />
+					<Button onClick={ this.apiCall }>{ __( 'Re-check Connection' ) }</Button>
 				</div>
 			</Placeholder>
 		);

From 7f06874875170f7863410d53bbc40f29f69ce847 Mon Sep 17 00:00:00 2001
From: Jefferson Rabb <jeff@atavist.net>
Date: Thu, 28 Feb 2019 12:32:51 -0500
Subject: [PATCH 2/5] Change to Connection button styling.

---
 client/gutenberg/extensions/mailchimp/edit.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/gutenberg/extensions/mailchimp/edit.jsx b/client/gutenberg/extensions/mailchimp/edit.jsx
index 534deca662e7f..c40c8f8d2cd99 100644
--- a/client/gutenberg/extensions/mailchimp/edit.jsx
+++ b/client/gutenberg/extensions/mailchimp/edit.jsx
@@ -145,7 +145,7 @@ class MailchimpSubscribeEdit extends Component {
 					) }
 					<br />
 					<br />
-					<Button isPrimary href={ connectURL } target="_blank">
+					<Button isDefault isLarge href={ connectURL } target="_blank">
 						{ __( 'Set up Mailchimp form' ) }
 					</Button>
 					<br />

From e2f0c0da4b808f7d98773be6636450c742adeaca Mon Sep 17 00:00:00 2001
From: Jefferson Rabb <jeff@atavist.net>
Date: Fri, 1 Mar 2019 07:54:00 -0500
Subject: [PATCH 3/5] Add isBorderless to Re-check button.

---
 client/gutenberg/extensions/mailchimp/edit.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/gutenberg/extensions/mailchimp/edit.jsx b/client/gutenberg/extensions/mailchimp/edit.jsx
index c40c8f8d2cd99..244b01cfd936a 100644
--- a/client/gutenberg/extensions/mailchimp/edit.jsx
+++ b/client/gutenberg/extensions/mailchimp/edit.jsx
@@ -150,7 +150,9 @@ class MailchimpSubscribeEdit extends Component {
 					</Button>
 					<br />
 					<br />
-					<Button onClick={ this.apiCall }>{ __( 'Re-check Connection' ) }</Button>
+					<Button isBorderless onClick={ this.apiCall }>
+						{ __( 'Re-check Connection' ) }
+					</Button>
 				</div>
 			</Placeholder>
 		);

From 9283023955d83cd602c21d21981a4ea0d51462e5 Mon Sep 17 00:00:00 2001
From: Jefferson Rabb <jeff@atavist.net>
Date: Fri, 1 Mar 2019 08:19:55 -0500
Subject: [PATCH 4/5] Revised button attributes for placeholder.

---
 client/gutenberg/extensions/mailchimp/edit.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/gutenberg/extensions/mailchimp/edit.jsx b/client/gutenberg/extensions/mailchimp/edit.jsx
index 244b01cfd936a..adb4a90371d44 100644
--- a/client/gutenberg/extensions/mailchimp/edit.jsx
+++ b/client/gutenberg/extensions/mailchimp/edit.jsx
@@ -145,12 +145,12 @@ class MailchimpSubscribeEdit extends Component {
 					) }
 					<br />
 					<br />
-					<Button isDefault isLarge href={ connectURL } target="_blank">
+					<Button isPrimary isLarge href={ connectURL } target="_blank">
 						{ __( 'Set up Mailchimp form' ) }
 					</Button>
 					<br />
 					<br />
-					<Button isBorderless onClick={ this.apiCall }>
+					<Button isDefault isLarge onClick={ this.apiCall }>
 						{ __( 'Re-check Connection' ) }
 					</Button>
 				</div>

From 13f7ed56b1e69149a8389d35626fa96051a0a5e1 Mon Sep 17 00:00:00 2001
From: Jefferson Rabb <jeff@atavist.net>
Date: Fri, 1 Mar 2019 09:03:24 -0500
Subject: [PATCH 5/5] Further revisions to button styles.

---
 client/gutenberg/extensions/mailchimp/edit.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/gutenberg/extensions/mailchimp/edit.jsx b/client/gutenberg/extensions/mailchimp/edit.jsx
index adb4a90371d44..c39098eeb13dd 100644
--- a/client/gutenberg/extensions/mailchimp/edit.jsx
+++ b/client/gutenberg/extensions/mailchimp/edit.jsx
@@ -145,12 +145,12 @@ class MailchimpSubscribeEdit extends Component {
 					) }
 					<br />
 					<br />
-					<Button isPrimary isLarge href={ connectURL } target="_blank">
+					<Button isDefault isLarge href={ connectURL } target="_blank">
 						{ __( 'Set up Mailchimp form' ) }
 					</Button>
 					<br />
 					<br />
-					<Button isDefault isLarge onClick={ this.apiCall }>
+					<Button isLink onClick={ this.apiCall }>
 						{ __( 'Re-check Connection' ) }
 					</Button>
 				</div>