Changeset 49728 for branches/5.6/src/wp-content/themes/twentytwentyone/assets/sass/02-tools/mixins.scss

Timestamp:

12/01/2020 07:25:43 PM (4 years ago)

Author:

desrosj

Message:

Twenty Twenty-One: Sync the latest changes for 5.6 RC2.

This will be the final sync from GitHub before placing that repository into read-only mode. All further changes should now flow entirely through Trac.

For a full list of changes since [49633], see ​https://github.com/WordPress/twentytwentyone/compare/1d5a895...53acd9b.

Props poena, luminuu, kjellr, ryelle, allancole, melchoyce, felipeelia, aljullu, kebbet, chaton666, Clorith, mkaz, ingereck, paaljoachim.
Reviewed by desrosj, SergeyBiryukov.
Merges [49726] to the 5.6 branch.
Fixes #51526.

Location:

branches/5.6

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentytwentyone/assets/sass/02-tools/mixins.scss (modified) (2 diffs)

branches/5.6/src/wp-content/themes/twentytwentyone/assets/sass/02-tools/mixins.scss

@@ -18 +18 @@
 }
 
-// Crop Text Boundry
-// - Sets a fixed-width on content within alignwide and alignfull blocks
-@mixin crop-text($inset-line-height: 1) {
-
-    line-height: $inset-line-height;
-    $offset-top: calc(.5em * #{$inset-line-height} + -.38);
-    $offset-bottom: calc(.5em * #{$inset-line-height} + -.39);
-
-    &:before,
-    &:after {
-        content: "";
-        display: block;
-        height: 0;
-        width: 0;
-    }
-
-    &:before {
-        margin-bottom: -($offset-top);
-    }
-
-    &:after {
-        margin-top: -($offset-bottom);
-    }
-}
-
 // Button style
 // - Applies button styles to blocks and elements that share them.
 @mixin button-style() {
-    @include crop-text(var(--button--line-height));
+    line-height: var(--button--line-height);
     color: var(--button--color-text);
     cursor: pointer;
@@ -78 +53 @@
     }
 }
+
+@mixin innerblock-margin-clear($container) {
+
+    // Clear the top margin for the first-child.
+    > #{$container} > *:first-child {
+        margin-top: 0;
+    }
+
+    // Last child that is not the appender.
+    > #{$container} > *: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 > #{$container} > *:nth-last-child(2),
+    &.is-selected > #{$container} > *:nth-last-child(2) {
+        margin-bottom: 0;
+    }
+}