From d4eb1ec5a3419b2d941d8cb05df7b8af2042932b Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Wed, 11 Oct 2023 00:31:47 +0100
Subject: [PATCH] Move wrapper div for search bar into page_listing_header

This stops the padding from appearing on the edit/create views (where there is no search bar)
---
 .../pages/page_listing_header.html            | 40 ++++++++++---------
 .../shared/headers/slim_header.html           |  6 +--
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/pages/page_listing_header.html b/wagtail/admin/templates/wagtailadmin/pages/page_listing_header.html
index 8031541e24..1b299e1247 100644
--- a/wagtail/admin/templates/wagtailadmin/pages/page_listing_header.html
+++ b/wagtail/admin/templates/wagtailadmin/pages/page_listing_header.html
@@ -33,24 +33,28 @@
 {% endblock %}
 
 {% block search_form %}
-    <form
-        class="search-form"
-        action="{{ index_url }}"
-        method="get"
-        novalidate
-        role="search"
-        data-controller="w-swap"
-        data-action="change->w-swap#searchLazy input->w-swap#searchLazy"
-        data-w-swap-src-value="{{ results_url }}"
-        data-w-swap-target-value="#listing-results"
-    >
-        {% for field in search_form %}
-            {% include "wagtailadmin/shared/field.html" with field=field classname="w-mb-0 -w-mt-2.5" sr_only_label=True icon="search" %}
-        {% endfor %}
-        {% comment %}Add an initial disabled & hidden submit button so that pressing 'enter' will not submit form. Reload not required as the content is dynamically loaded.{% endcomment %}
-        <div class="visuallyhidden"><input disabled type="submit" aria-hidden="true"/></div>
-        <div class="submit visuallyhidden"><input type="submit" value="Search" class="button" /></div>
-    </form>
+    <div class="w-pl-5 w-pb-7.5">
+        <div class="w-pl-0 sm:w-pl-slim-header w-ml-2.5">
+            <form
+                class="search-form"
+                action="{{ index_url }}"
+                method="get"
+                novalidate
+                role="search"
+                data-controller="w-swap"
+                data-action="change->w-swap#searchLazy input->w-swap#searchLazy"
+                data-w-swap-src-value="{{ results_url }}"
+                data-w-swap-target-value="#listing-results"
+            >
+                {% for field in search_form %}
+                    {% include "wagtailadmin/shared/field.html" with field=field classname="w-mb-0 -w-mt-2.5" sr_only_label=True icon="search" %}
+                {% endfor %}
+                {% comment %}Add an initial disabled & hidden submit button so that pressing 'enter' will not submit form. Reload not required as the content is dynamically loaded.{% endcomment %}
+                <div class="visuallyhidden"><input disabled type="submit" aria-hidden="true"/></div>
+                <div class="submit visuallyhidden"><input type="submit" value="Search" class="button" /></div>
+            </form>
+        </div>
+    </div>
 {% endblock %}
 
 {% block side_panels %}
diff --git a/wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html b/wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html
index 797d44c2e1..1a46dedac0 100644
--- a/wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html
+++ b/wagtail/admin/templates/wagtailadmin/shared/headers/slim_header.html
@@ -28,11 +28,7 @@
                 {% endblock %}
             </div>
         </div>
-        <div class="w-pl-5 w-pb-7.5">
-            <div class="w-pl-0 sm:w-pl-slim-header w-ml-2.5">
-                {% block search_form %}{% endblock %}
-            </div>
-        </div>
+        {% block search_form %}{% endblock %}
     </header>
 
     {% block side_panels %}