mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-07 11:19:12 +00:00
Code Issues 32 Releases Wiki Activity

[4.0.x] Fixed #33407 -- Fixed .radiolist admin CSS.

Browse Source 
Regression in 5942ab5eb165ee2e759174e297148a40dd855920.

Backport of 85f2a9fb0f0973930abc84a725bc30703aa3d98b from main
This commit is contained in:
Carlton Gibson 2022-01-19 12:06:38 +01:00
parent c28a41f4f1
commit f82ca84f77
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/contrib/admin/static/admin/css/forms.css
View File

@ -37,16 +37,19 @@ label {
/* RADIO BUTTONS */ /* RADIO BUTTONS */
form ul.radiolist li { form div.radiolist div {
list-style-type: none; padding-right: 7px;
} }
form ul.radiolist label { form div.radiolist.inline div {
float: none; display: inline-block;
display: inline;
} }
form ul.radiolist input[type="radio"] { form div.radiolist label {
width: auto;
}
form div.radiolist input[type="radio"] {
margin: -2px 4px 0 0; margin: -2px 4px 0 0;
padding: 0; padding: 0;
} }
@ -106,7 +109,7 @@ form .aligned ul {
padding-left: 10px; padding-left: 10px;
} }
form .aligned ul.radiolist { form .aligned div.radiolist {
display: inline-block; display: inline-block;
margin: 0; margin: 0;
padding: 0; padding: 0;

7
django/contrib/admin/static/admin/css/responsive.css
View File

@ -232,7 +232,7 @@ input[type="submit"], button {
margin-left: 15px; margin-left: 15px;
} }
form .aligned ul.radiolist { form .aligned div.radiolist {
margin-left: 2px; margin-left: 2px;
} }
@ -650,12 +650,13 @@ input[type="submit"], button {
padding-left: 0; padding-left: 0;
} }
form .aligned ul.radiolist { form .aligned div.radiolist {
margin-top: 5px;
margin-right: 15px; margin-right: 15px;
margin-bottom: -3px; margin-bottom: -3px;
} }
form .aligned ul.radiolist:not(.inline) li + li { form .aligned div.radiolist:not(.inline) div + div {
margin-top: 5px; margin-top: 5px;
} }

3
docs/releases/4.0.2.txt
View File

@ -25,3 +25,6 @@ Bugfixes
* Fixed a regression in Django 4.0 that caused a crash of ``makemigrations`` on * 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 models without ``Meta.order_with_respect_to`` but with a field named
``_order`` (:ticket:`33449`). ``_order`` (:ticket:`33449`).
* Fixed a regression in Django 4.0 that caused incorrect
:attr:`.ModelAdmin.radio_fields` layout in the admin (:ticket:`33407`).