Select the last child if no appender is present.

WordPress · Nov 20, 2020 · 70e6f3e · 70e6f3e
1 parent 826721c
commit 70e6f3e
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 22 deletions.
diff --git a/assets/css/ie-editor.css b/assets/css/ie-editor.css
diff --git a/assets/css/style-editor.css b/assets/css/style-editor.css
diff --git a/assets/sass/02-tools/mixins.scss b/assets/sass/02-tools/mixins.scss
@@ -85,8 +85,13 @@
 		margin-top: 0;
 	}
 
-	// Needs to be the second-last child to avoid applying this to the appender.
-	> *:nth-last-child(2) {
+	// Last child that is not the appender.
+	> *:last-child():not(.block-list-appender) {
+		margin-bottom: 0;
+	}
+
+	// When selected, the last item becomes the second last because of the appender.
+	&.has-child-selected > *:nth-last-child(2) {
 		margin-bottom: 0;
 	}
 }
diff --git a/assets/sass/05-blocks/media-text/_editor.scss b/assets/sass/05-blocks/media-text/_editor.scss
@@ -7,14 +7,7 @@
 
 	.wp-block-media-text__content {
 		padding: var(--global--spacing-horizontal);
-
-		[data-block]:first-child {
-			margin-top: 0;
-		}
-
-		[data-block]:last-child {
-			margin-bottom: 0;
-		}
+		@include innerblock-margin-clear();
 	}
 
 	// Block Styles