Merge branch '5.x' into 5.5

CHANGELOG.md

@@ -5,6 +5,8 @@
 - Fixed a bug where the `utils/fix-field-layout-uids` command was misidentifying missing/duplicate UUID issues.
 - 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.
 
 ## 5.4.10.1 - 2024-11-07
 

src/elements/NestedElementManager.php

@@ -1240,8 +1240,10 @@ public function deleteNestedElements(ElementInterface $owner, bool $hardDelete =
             $elementsService = Craft::$app->getElements();
             $query = $this->nestedElementQuery($owner)
                 ->status(null)
-                ->trashed(null)
                 ->siteId($siteId);
+            if ($hardDelete) {
+                $query->trashed(null);
+            }
             $query->{$this->ownerIdParam} = null;
             $query->{$this->primaryOwnerIdParam} = $owner->id;
             /** @var NestedElementInterface[] $elements */

src/web/assets/cp/src/css/_main.scss

@@ -5448,7 +5448,7 @@ table.data tbody tr:not(.disabled).active-drop-target {
   margin-block: calc(var(--xl) * -1) var(--xl);
   margin-inline: var(--neg-padding);
   padding-block: 5px 6px;
-  padding-inline: var(--xl);
+  padding-inline: var(--padding);
   min-height: 45px;
   box-sizing: border-box;
   box-shadow: inset 0 -1px 0 0 color.adjust(mixins.$grey300, $alpha: -0.75);