From 70e6f3efe4e35dc00e38ce275b48f9e57126a142 Mon Sep 17 00:00:00 2001 From: Kjell Reigstad Date: Fri, 20 Nov 2020 09:06:35 -0500 Subject: [PATCH] Select the last child if no appender is present. --- assets/css/ie-editor.css | 29 +++++++++++++++---- assets/css/style-editor.css | 29 +++++++++++++++---- assets/sass/02-tools/mixins.scss | 9 ++++-- assets/sass/05-blocks/media-text/_editor.scss | 9 +----- 4 files changed, 54 insertions(+), 22 deletions(-) diff --git a/assets/css/ie-editor.css b/assets/css/ie-editor.css index eefb3f398..69f5770c0 100644 --- a/assets/css/ie-editor.css +++ b/assets/css/ie-editor.css @@ -578,8 +578,13 @@ a:hover { margin-top: 0; } -.wp-block-cover .wp-block-cover__inner-container > *:nth-last-child(2), -.wp-block-cover-image .wp-block-cover__inner-container > *:nth-last-child(2) { +.wp-block-cover .wp-block-cover__inner-container > *:last-child():not(.block-list-appender), +.wp-block-cover-image .wp-block-cover__inner-container > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-cover .wp-block-cover__inner-container.has-child-selected > *:nth-last-child(2), +.wp-block-cover-image .wp-block-cover__inner-container.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } @@ -747,7 +752,11 @@ a:hover { margin-top: 0; } -.wp-block-columns .wp-block-column > *:nth-last-child(2) { +.wp-block-columns .wp-block-column > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-columns .wp-block-column.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } @media only screen and (min-width: 652px) { @@ -968,7 +977,11 @@ a:hover { margin-top: 0; } -.wp-block-group .wp-block-group__inner-container > *:nth-last-child(2) { +.wp-block-group .wp-block-group__inner-container > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-group .wp-block-group__inner-container.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } @@ -1720,11 +1733,15 @@ dt { padding: 25px; } -.wp-block-media-text .wp-block-media-text__content [data-block]:first-child { +.wp-block-media-text .wp-block-media-text__content > *:first-child { margin-top: 0; } -.wp-block-media-text .wp-block-media-text__content [data-block]:last-child { +.wp-block-media-text .wp-block-media-text__content > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-media-text .wp-block-media-text__content.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } diff --git a/assets/css/style-editor.css b/assets/css/style-editor.css index a3046c4c4..4cb4a1369 100644 --- a/assets/css/style-editor.css +++ b/assets/css/style-editor.css @@ -682,8 +682,13 @@ a:hover { margin-top: 0; } -.wp-block-cover .wp-block-cover__inner-container > *:nth-last-child(2), -.wp-block-cover-image .wp-block-cover__inner-container > *:nth-last-child(2) { +.wp-block-cover .wp-block-cover__inner-container > *:last-child():not(.block-list-appender), +.wp-block-cover-image .wp-block-cover__inner-container > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-cover .wp-block-cover__inner-container.has-child-selected > *:nth-last-child(2), +.wp-block-cover-image .wp-block-cover__inner-container.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } @@ -774,7 +779,11 @@ a:hover { margin-top: 0; } -.wp-block-columns .wp-block-column > *:nth-last-child(2) { +.wp-block-columns .wp-block-column > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-columns .wp-block-column.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } @media only screen and (min-width: 652px) { @@ -932,7 +941,11 @@ a:hover { margin-top: 0; } -.wp-block-group .wp-block-group__inner-container > *:nth-last-child(2) { +.wp-block-group .wp-block-group__inner-container > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-group .wp-block-group__inner-container.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } @@ -1321,11 +1334,15 @@ dt { padding: var(--global--spacing-horizontal); } -.wp-block-media-text .wp-block-media-text__content [data-block]:first-child { +.wp-block-media-text .wp-block-media-text__content > *:first-child { margin-top: 0; } -.wp-block-media-text .wp-block-media-text__content [data-block]:last-child { +.wp-block-media-text .wp-block-media-text__content > *:last-child():not(.block-list-appender) { + margin-bottom: 0; +} + +.wp-block-media-text .wp-block-media-text__content.has-child-selected > *:nth-last-child(2) { margin-bottom: 0; } diff --git a/assets/sass/02-tools/mixins.scss b/assets/sass/02-tools/mixins.scss index 354868aed..6f9bf782f 100644 --- 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; } } \ No newline at end of file diff --git a/assets/sass/05-blocks/media-text/_editor.scss b/assets/sass/05-blocks/media-text/_editor.scss index 3f3a5fcf5..30af21e23 100644 --- 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