Merge branch '5.x' into 5.5

craftcms · Nov 12, 2024 · cb0a0ff · cb0a0ff
2 parents a399d6b + d40c10d
commit cb0a0ff
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,7 @@
 - Fixed an error that could occur when upgrading to Craft 5, if unused field layouts contained duplicate UUIDs. ([#16032](https://github.com/craftcms/cms/issues/16032))
 - Fixed a bug where Live Preview wasn’t reloading after performing bulk actions in embedded element indexes. ([#16057](https://github.com/craftcms/cms/discussions/16057))
 - Fixed a bug where restoring a soft-deleted element would restore any nested elements that had been explicitly soft-deleted. ([#16059](https://github.com/craftcms/cms/issues/16059))
-- Fixed a mobile styling bug.
+- Fixed styling bugs. ([#16061](https://github.com/craftcms/cms/issues/16061))
 
 ## 5.4.10.1 - 2024-11-07
 

diff --git a/src/web/assets/cp/dist/css/cp.css b/src/web/assets/cp/dist/css/cp.css
diff --git a/src/web/assets/cp/dist/css/cp.css.map b/src/web/assets/cp/dist/css/cp.css.map
diff --git a/src/web/assets/cp/src/css/_main.scss b/src/web/assets/cp/src/css/_main.scss
@@ -5744,7 +5744,11 @@ table.data tbody tr:not(.disabled).active-drop-target {
     }
   }
 
-  & > fieldset {
+  /*
+  When there's no .meta container (which can occur when editing a matrix block)
+  make sure the sidebar aligns with the top of the content area.
+   */
+  & > fieldset:not(:first-child) {
     margin-block: var(--spacing) !important;
     margin-inline: 0 !important;
   }