From 4aae864463b149393a36e0b18345cf6ed392634d Mon Sep 17 00:00:00 2001
From: Tom Carrick <tom@carrick.eu>
Date: Fri, 8 Dec 2023 17:35:37 +0100
Subject: [PATCH] Fixed #35012 -- Restored wrapping admin fieldsets with
 multiple fields per line.

Thanks James Gillard for the report.

Regression in 729266c6f29c7a0677b24926a86a767ef3078b26.
---
 django/contrib/admin/static/admin/css/forms.css | 4 ++++
 docs/releases/4.2.9.txt                         | 3 ++-
 docs/releases/5.0.1.txt                         | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index 65cf0aaf123..5ba9d1ff1bf 100644
--- a/django/contrib/admin/static/admin/css/forms.css
+++ b/django/contrib/admin/static/admin/css/forms.css
@@ -26,6 +26,10 @@ form .form-row p {
     display: flex;
 }
 
+.form-multiline {
+    flex-wrap: wrap;
+}
+
 .form-multiline > div {
     padding-bottom: 10px;
 }
diff --git a/docs/releases/4.2.9.txt b/docs/releases/4.2.9.txt
index f98803f5eaf..5202fbb6e77 100644
--- a/docs/releases/4.2.9.txt
+++ b/docs/releases/4.2.9.txt
@@ -9,4 +9,5 @@ Django 4.2.9 fixes a bug in 4.2.8.
 Bugfixes
 ========
 
-* ...
+* Fixed a regression in Django 4.2.8 where admin fields on the same line could
+  overflow the page and become non-interactive (:ticket:`35012`).
diff --git a/docs/releases/5.0.1.txt b/docs/releases/5.0.1.txt
index 2e720e57f09..79fbf9a0a18 100644
--- a/docs/releases/5.0.1.txt
+++ b/docs/releases/5.0.1.txt
@@ -24,3 +24,6 @@ Bugfixes
 * Fixed a bug in Django 5.0 that caused a migration crash on Oracle < 23c when
   adding a ``GeneratedField`` with ``output_field=BooleanField``
   (:ticket:`35018`).
+
+* Fixed a regression in Django 5.0 where admin fields on the same line could
+  overflow the page and become non-interactive (:ticket:`35012`).