summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2024-04-19 13:23:22 +0200
committerSarah Boyce <42296566+sarahboyce@users.noreply.github.com>2024-04-19 13:29:30 +0200
commit256f719cb38eee49dcc529ddf1e0b95aa440d133 (patch)
treeb405b4e4b866686cf370e6334a6744a3db088fc2
parent0fc832676cd585fa420d583937b5b2318bc2c629 (diff)
[4.2.x] Reverted "Fixed #34994, Fixed #35386 -- Applied checkbox-row CSS class unconditionally in Admin."
This reverts commit 0fc832676cd585fa420d583937b5b2318bc2c629.
-rw-r--r--django/contrib/admin/templates/admin/includes/fieldset.html2
-rw-r--r--docs/releases/4.2.12.txt4
2 files changed, 1 insertions, 5 deletions
diff --git a/django/contrib/admin/templates/admin/includes/fieldset.html b/django/contrib/admin/templates/admin/includes/fieldset.html
index 04e76055ce..9a4372f791 100644
--- a/django/contrib/admin/templates/admin/includes/fieldset.html
+++ b/django/contrib/admin/templates/admin/includes/fieldset.html
@@ -9,7 +9,7 @@
{% for field in line %}
<div>
{% if not line.fields|length == 1 and not field.is_readonly %}{{ field.errors }}{% endif %}
- <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% endif %}{% if field.is_checkbox %} checkbox-row{% endif %}">
+ <div class="flex-container{% if not line.fields|length == 1 %} fieldBox{% if field.field.name %} field-{{ field.field.name }}{% endif %}{% if not field.is_readonly and field.errors %} errors{% endif %}{% if field.field.is_hidden %} hidden{% endif %}{% elif field.is_checkbox %} checkbox-row{% endif %}">
{% if field.is_checkbox %}
{{ field.field }}{{ field.label_tag }}
{% else %}
diff --git a/docs/releases/4.2.12.txt b/docs/releases/4.2.12.txt
index 7423dd8745..64a6832d59 100644
--- a/docs/releases/4.2.12.txt
+++ b/docs/releases/4.2.12.txt
@@ -12,7 +12,3 @@ Bugfixes
* Fixed a crash in Django 4.2 when validating email max line lengths with
content decoded using the ``surrogateescape`` error handling scheme
(:ticket:`35361`).
-
-* Fixed a regression in Django 4.2 where multiple checkboxes in the admin would
- be centered on narrower screen widths (:ticket:`34994`) or have misaligned
- labels (:ticket:`35386`).