From a7555ebb67bb4e550b749f316c113a81e80b105b Mon Sep 17 00:00:00 2001
From: Mapk <uraine@gmail.com>
Date: Fri, 29 Mar 2019 20:31:50 -0700
Subject: [PATCH 1/3] Changed the background grey of the shortcode block to
 match all the other placeholder setup screens on other blocks. Fixes #14718

---
 packages/block-library/src/shortcode/editor.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/shortcode/editor.scss b/packages/block-library/src/shortcode/editor.scss
index d623927605d40c..8f644ba5a4d014 100644
--- a/packages/block-library/src/shortcode/editor.scss
+++ b/packages/block-library/src/shortcode/editor.scss
@@ -2,7 +2,7 @@
 	display: flex;
 	flex-direction: row;
 	padding: $block-padding;
-	background-color: $light-gray-100;
+	background-color: $dark-opacity-light-200;
 	font-size: $default-font-size;
 	font-family: $default-font;
 

From aaa9e3ac54d904ff96a97d4a9370d52b27f1b506 Mon Sep 17 00:00:00 2001
From: Mapk <uraine@gmail.com>
Date: Fri, 29 Mar 2019 21:21:12 -0700
Subject: [PATCH 2/3] Restyled shortcode block to match placeholder block
 styling.

---
 packages/block-library/src/shortcode/editor.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/shortcode/editor.scss b/packages/block-library/src/shortcode/editor.scss
index 8f644ba5a4d014..ffa3592b848688 100644
--- a/packages/block-library/src/shortcode/editor.scss
+++ b/packages/block-library/src/shortcode/editor.scss
@@ -1,6 +1,6 @@
 .wp-block-shortcode {
 	display: flex;
-	flex-direction: row;
+	flex-direction: column;
 	padding: $block-padding;
 	background-color: $dark-opacity-light-200;
 	font-size: $default-font-size;
@@ -9,7 +9,6 @@
 	label {
 		display: flex;
 		align-items: center;
-		margin-right: $grid-size;
 		white-space: nowrap;
 		font-weight: 600;
 		flex-shrink: 0;
@@ -17,6 +16,9 @@
 
 	.block-editor-plain-text {
 		flex-grow: 1;
+		line-height: 1;
+		max-height: 30px;
+		width: 80%;
 	}
 
 	.dashicon {

From 1c67d6cacdcf626d58336ea4906960df9556c950 Mon Sep 17 00:00:00 2001
From: Mapk <uraine@gmail.com>
Date: Fri, 5 Apr 2019 12:42:30 -0700
Subject: [PATCH 3/3] Rebased and force pushed to catch up with changes made to
 this file since @gziolo made some changes.

---
 packages/block-library/src/shortcode/edit.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/shortcode/edit.js b/packages/block-library/src/shortcode/edit.js
index b45b239f1bcf25..5a9dbf7f5c7952 100644
--- a/packages/block-library/src/shortcode/edit.js
+++ b/packages/block-library/src/shortcode/edit.js
@@ -10,8 +10,8 @@ const ShortcodeEdit = ( { attributes, setAttributes, instanceId } ) => {
 	const inputId = `blocks-shortcode-input-${ instanceId }`;
 
 	return (
-		<div className="wp-block-shortcode">
-			<label htmlFor={ inputId }>
+		<div className="wp-block-shortcode  components-placeholder">
+			<label htmlFor={ inputId } className="components-placeholder__label">
 				<Dashicon icon="shortcode" />
 				{ __( 'Shortcode' ) }
 			</label>