From a106a3e8050d74ff6b3e2b4ecb068f0f7424a735 Mon Sep 17 00:00:00 2001
From: Sage Abdullah <sage.abdullah@torchbox.com>
Date: Thu, 29 Feb 2024 12:15:50 +0000
Subject: [PATCH] Remove extraneous padding in chooser modal listings

Fixes #11704
---
 CHANGELOG.txt                        |  1 +
 client/scss/components/_listing.scss | 12 +++++++++---
 docs/releases/6.1.md                 |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e55157f0cc..7fe83c1b49 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,6 +20,7 @@ Changelog
  * Fix: Ensure re-ordering buttons work correctly when using a nested InlinePanel (Adrien Hamraoui)
  * Fix: Consistently remove model's `verbose_name` in group edit view when listing custom permissions (Sage Abdullah, Neeraj Yetheendran, Omkar Jadhav)
  * Fix: Resolve issue local development of docs when running `make livehtml` (Sage Abdullah)
+ * Fix: Resolve issue with unwanted padding in chooser modal listings (Sage Abdullah)
  * Docs: Add contributing development documentation on how to work with a fork of Wagtail (Nix Asteri, Dan Braghis)
  * Docs: Make sure the settings panel is listed in tabbed interface examples (Tibor Leupold)
  * Docs: Update content and page names to their US spelling instead of UK spelling (Victoria Poromon)
diff --git a/client/scss/components/_listing.scss b/client/scss/components/_listing.scss
index 0ab054d71f..743d38d3fd 100644
--- a/client/scss/components/_listing.scss
+++ b/client/scss/components/_listing.scss
@@ -635,9 +635,15 @@ table.listing {
       }
     }
 
-    // If no bulk actions are present, and nice padding is not applied,
-    // apply the same 80px padding via the first column's left padding.
-    &:not(.nice-padding &, .report &):not(
+    // If either:
+    // - no nice padding is applied,
+    // - we're not in a report listing,
+    // - we're not in the editor view,
+    // and:
+    // - no bulk actions are present,
+    // - we're not in the "custom ordering" mode,
+    // then apply the same 80px padding via the first column's left padding.
+    &:not(.nice-padding &, .report &, .editor-view &):not(
         :has(.bulk-actions-filter-checkbox, .ord)
       ) {
       th:first-child,
diff --git a/docs/releases/6.1.md b/docs/releases/6.1.md
index f40e7c8335..35f6ab1fb9 100644
--- a/docs/releases/6.1.md
+++ b/docs/releases/6.1.md
@@ -33,6 +33,7 @@ depth: 1
  * Ensure re-ordering buttons work correctly when using a nested InlinePanel (Adrien Hamraoui)
  * Consistently remove model's `verbose_name` in group edit view when listing custom permissions (Sage Abdullah, Neeraj Yetheendran, Omkar Jadhav)
  * Resolve issue local development of docs when running `make livehtml` (Sage Abdullah)
+ * Resolve issue with unwanted padding in chooser modal listings (Sage Abdullah)
 
 
 ### Documentation