From d1b61033f080a2ae0382f7628ccdbd6f0cc0ec23 Mon Sep 17 00:00:00 2001
From: Jon Q <hello@jonquach.com>
Date: Wed, 15 Jan 2020 10:07:08 -0500
Subject: [PATCH 1/3] Fix error message sizing + alignment in Embed Placeholder

---
 .../block-library/src/embed/embed-placeholder.js     | 12 ++++++------
 packages/components/src/placeholder/style.scss       |  6 ++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/block-library/src/embed/embed-placeholder.js b/packages/block-library/src/embed/embed-placeholder.js
index 247d012674c4bf..b02f38346e424b 100644
--- a/packages/block-library/src/embed/embed-placeholder.js
+++ b/packages/block-library/src/embed/embed-placeholder.js
@@ -28,18 +28,18 @@ const EmbedPlaceholder = ( props ) => {
 				>
 					{ _x( 'Embed', 'button label' ) }
 				</Button>
-				{ cannotEmbed &&
-					<p className="components-placeholder__error">
-						{ __( 'Sorry, this content could not be embedded.' ) }<br />
-						<Button isSecondary onClick={ tryAgain }>{ _x( 'Try again', 'button label' ) }</Button> <Button isSecondary onClick={ fallback }>{ _x( 'Convert to link', 'button label' ) }</Button>
-					</p>
-				}
 			</form>
 			<div className="components-placeholder__learn-more">
 				<ExternalLink href={ __( 'https://wordpress.org/support/article/embeds/' ) }>
 					{ __( 'Learn more about embeds' ) }
 				</ExternalLink>
 			</div>
+			{ cannotEmbed &&
+				<div className="components-placeholder__error">
+					{ __( 'Sorry, this content could not be embedded.' ) }<br />
+					<Button isSecondary onClick={ tryAgain }>{ _x( 'Try again', 'button label' ) }</Button> <Button isSecondary onClick={ fallback }>{ _x( 'Convert to link', 'button label' ) }</Button>
+				</div>
+			}
 		</Placeholder>
 	);
 };
diff --git a/packages/components/src/placeholder/style.scss b/packages/components/src/placeholder/style.scss
index beaac89a7c30c3..84f922752bb6a8 100644
--- a/packages/components/src/placeholder/style.scss
+++ b/packages/components/src/placeholder/style.scss
@@ -26,6 +26,7 @@
 	}
 }
 
+.components-placeholder__error,
 .components-placeholder__instructions,
 .components-placeholder__label,
 .components-placeholder__fieldset {
@@ -74,6 +75,11 @@
 	margin-bottom: 1em;
 }
 
+.components-placeholder__error {
+	margin-top: 1em;
+	width: 100%;
+}
+
 .components-placeholder__preview img {
 	margin: 3%;
 	width: 50%;

From 2025ee87e9985e65df86be4a09dd170b550d616e Mon Sep 17 00:00:00 2001
From: Jon Q <hello@jonquach.com>
Date: Wed, 15 Jan 2020 10:07:32 -0500
Subject: [PATCH 2/3] Fix Table placeholder input vs button alignment

---
 packages/block-library/src/table/editor.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-library/src/table/editor.scss b/packages/block-library/src/table/editor.scss
index 4bbab7aaeeae1d..7c69994400e558 100644
--- a/packages/block-library/src/table/editor.scss
+++ b/packages/block-library/src/table/editor.scss
@@ -63,6 +63,10 @@
 		}
 	}
 
+	.components-base-control__field {
+		margin-bottom: 0;
+	}
+
 	.wp-block-table__placeholder-button {
 		margin-top: auto;
 		margin-right: auto;

From cdc491cbdd4f50fd51f2cea6ad6c31d01542e8cf Mon Sep 17 00:00:00 2001
From: Jon Q <hello@jonquach.com>
Date: Tue, 21 Jan 2020 16:38:16 -0500
Subject: [PATCH 3/3] Adjust spacing between error message and buttons

---
 packages/block-library/src/embed/embed-placeholder.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/embed/embed-placeholder.js b/packages/block-library/src/embed/embed-placeholder.js
index b02f38346e424b..3d9053e3d156b6 100644
--- a/packages/block-library/src/embed/embed-placeholder.js
+++ b/packages/block-library/src/embed/embed-placeholder.js
@@ -36,7 +36,9 @@ const EmbedPlaceholder = ( props ) => {
 			</div>
 			{ cannotEmbed &&
 				<div className="components-placeholder__error">
-					{ __( 'Sorry, this content could not be embedded.' ) }<br />
+					<div className="components-placeholder__instructions">
+						{ __( 'Sorry, this content could not be embedded.' ) }
+					</div>
 					<Button isSecondary onClick={ tryAgain }>{ _x( 'Try again', 'button label' ) }</Button> <Button isSecondary onClick={ fallback }>{ _x( 'Convert to link', 'button label' ) }</Button>
 				</div>
 			}