summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlton Gibson <carlton.gibson@noumenal.es>2022-01-19 12:06:38 +0100
committerCarlton Gibson <carlton.gibson@noumenal.es>2022-01-26 10:04:08 +0100
commitf82ca84f775f534b32e6ffcef6baa75da6bec47b (patch)
tree018ea387cdc1fbf9819be8a550d5749c6f8a6bf7
parentc28a41f4f1d9c8f6bd0e60baa6ed79c332c89303 (diff)
[4.0.x] Fixed #33407 -- Fixed .radiolist admin CSS.
Regression in 5942ab5eb165ee2e759174e297148a40dd855920. Backport of 85f2a9fb0f0973930abc84a725bc30703aa3d98b from main
-rw-r--r--django/contrib/admin/static/admin/css/forms.css17
-rw-r--r--django/contrib/admin/static/admin/css/responsive.css7
-rw-r--r--docs/releases/4.0.2.txt3
3 files changed, 17 insertions, 10 deletions
diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css
index 5007d45bca..bb44be7fae 100644
--- a/django/contrib/admin/static/admin/css/forms.css
+++ b/django/contrib/admin/static/admin/css/forms.css
@@ -37,16 +37,19 @@ label {
/* RADIO BUTTONS */
-form ul.radiolist li {
- list-style-type: none;
+form div.radiolist div {
+ padding-right: 7px;
}
-form ul.radiolist label {
- float: none;
- display: inline;
+form div.radiolist.inline div {
+ display: inline-block;
+}
+
+form div.radiolist label {
+ width: auto;
}
-form ul.radiolist input[type="radio"] {
+form div.radiolist input[type="radio"] {
margin: -2px 4px 0 0;
padding: 0;
}
@@ -106,7 +109,7 @@ form .aligned ul {
padding-left: 10px;
}
-form .aligned ul.radiolist {
+form .aligned div.radiolist {
display: inline-block;
margin: 0;
padding: 0;
diff --git a/django/contrib/admin/static/admin/css/responsive.css b/django/contrib/admin/static/admin/css/responsive.css
index 8c6dd810ca..5779c5a949 100644
--- a/django/contrib/admin/static/admin/css/responsive.css
+++ b/django/contrib/admin/static/admin/css/responsive.css
@@ -232,7 +232,7 @@ input[type="submit"], button {
margin-left: 15px;
}
- form .aligned ul.radiolist {
+ form .aligned div.radiolist {
margin-left: 2px;
}
@@ -650,12 +650,13 @@ input[type="submit"], button {
padding-left: 0;
}
- form .aligned ul.radiolist {
+ form .aligned div.radiolist {
+ margin-top: 5px;
margin-right: 15px;
margin-bottom: -3px;
}
- form .aligned ul.radiolist:not(.inline) li + li {
+ form .aligned div.radiolist:not(.inline) div + div {
margin-top: 5px;
}
diff --git a/docs/releases/4.0.2.txt b/docs/releases/4.0.2.txt
index 31f6261b38..8227d98622 100644
--- a/docs/releases/4.0.2.txt
+++ b/docs/releases/4.0.2.txt
@@ -25,3 +25,6 @@ Bugfixes
* Fixed a regression in Django 4.0 that caused a crash of ``makemigrations`` on
models without ``Meta.order_with_respect_to`` but with a field named
``_order`` (:ticket:`33449`).
+
+* Fixed a regression in Django 4.0 that caused incorrect
+ :attr:`.ModelAdmin.radio_fields` layout in the admin (:ticket:`33407`).