Merge pull request #783 from WordPress/vertical-margins

Update vertical margins for full width blocks
WordPress · Nov 5, 2020 · 209d3b3 · 209d3b3
2 parents a39d50f + dcf381c
commit 209d3b3
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 28 deletions.
diff --git a/assets/css/ie-editor.css b/assets/css/ie-editor.css
diff --git a/assets/css/ie.css b/assets/css/ie.css
diff --git a/assets/css/style-editor.css b/assets/css/style-editor.css
diff --git a/assets/sass/05-blocks/cover/_editor.scss b/assets/sass/05-blocks/cover/_editor.scss
@@ -10,6 +10,11 @@
 	margin-top: inherit;
 	margin-bottom: inherit;
 
+	[data-align="full"] & {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+
 	.wp-block-cover__inner-container,
 	.wp-block-cover-image-text,
 	.wp-block-cover-text,

diff --git a/assets/sass/05-blocks/cover/_style.scss b/assets/sass/05-blocks/cover/_style.scss
@@ -5,6 +5,11 @@
 		clear: both;
 	}
 
+	&.alignfull {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+
 	background-color: var(--cover--color-background);
 	min-height: var(--cover--height);
 	margin-top: inherit;

diff --git a/assets/sass/05-blocks/group/_editor.scss b/assets/sass/05-blocks/group/_editor.scss
@@ -17,6 +17,11 @@
 
 	&.has-background {
 		padding: var(--global--spacing-vertical);
+
+		[data-align="full"] & {
+			margin-top: 0;
+			margin-bottom: 0;
+		}
 	}
 
 	// Block Styles

diff --git a/assets/sass/05-blocks/media-text/_editor.scss b/assets/sass/05-blocks/media-text/_editor.scss
@@ -1,5 +1,10 @@
 .wp-block-media-text {
 
+	[data-align="full"] & {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+
 	.wp-block-media-text__content {
 		padding: var(--global--spacing-horizontal);
 

diff --git a/assets/sass/05-blocks/media-text/_style.scss b/assets/sass/05-blocks/media-text/_style.scss
@@ -1,5 +1,10 @@
 .wp-block-media-text {
 
+	&.alignfull {
+		margin-top: 0;
+		margin-bottom: 0;
+	}
+
 	a:focus img {
 		outline-offset: -1px;
 	}

diff --git a/assets/sass/05-blocks/utilities/_editor.scss b/assets/sass/05-blocks/utilities/_editor.scss
@@ -107,22 +107,6 @@
 	}
 }
 
-// Selects the post editor and not the site editor
-.block-editor-block-list__layout:not(.edit-site-block-editor__block-list) {
-
-	.wp-block {
-
-		&[data-align="full"],
-		&.alignfull {
-
-			>[data-block] {
-				margin-top: 0;
-				margin-bottom: 0;
-			}
-		}
-	}
-}
-
 .alignleft {
 	margin: 0;
 	margin-right: var(--global--spacing-horizontal);

diff --git a/style-rtl.css b/style-rtl.css
diff --git a/style.css b/style.css