summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Carrick <tom@carrick.eu>2023-12-08 17:35:37 +0100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2023-12-13 12:34:19 +0100
commit8b0710cfc9e845abb2017b007d3dc7aaca3b7979 (patch)
treefb63c7c611318d62118a12505b41969bdd5704a6
parent5f89da0837009debda998af30f280d7075fb1a4d (diff)
[5.0.x] Fixed #35012 -- Restored wrapping admin fieldsets with multiple fields per line.
Thanks James Gillard for the report. Regression in 729266c6f29c7a0677b24926a86a767ef3078b26. Backport of 4aae864463b149393a36e0b18345cf6ed392634d from main
-rw-r--r--django/contrib/admin/static/admin/css/forms.css4
-rw-r--r--docs/releases/4.2.9.txt3
-rw-r--r--docs/releases/5.0.1.txt3
3 files changed, 9 insertions, 1 deletions
diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index 6cfe9da119..9a8dad08cc 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 f98803f5ea..5202fbb6e7 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 2e720e57f0..79fbf9a0a1 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`).