From 5b2c4a049e9bbe9a6caaab993a2eedd5702ea36c Mon Sep 17 00:00:00 2001 From: usman Date: Fri, 20 Feb 2026 01:19:53 +0500 Subject: [6.0.x] Fixed #36920 -- Fixed alignment of fieldset legends in wide admin forms. Visual regression in 4187da258fe212d494cb578a0bc2b52c4979ab95. Backport of 8d251b512bafd7b7f736cfcabeba0ae76106f2db from main. --- AUTHORS | 1 + django/contrib/admin/static/admin/css/forms.css | 3 ++- django/contrib/admin/static/admin/css/rtl.css | 3 ++- docs/releases/6.0.3.txt | 3 +++ tests/admin_views/test_password_form.py | 10 ++++++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 0a764879ab..932acb47d5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -771,6 +771,7 @@ answer newbie questions, and generally made Django that much better: Mridul Dhall msaelices msundstr + Muhammad Usman Mushtaq Ali Mykola Zamkovoi Nadège Michel diff --git a/django/contrib/admin/static/admin/css/forms.css b/django/contrib/admin/static/admin/css/forms.css index 6294f368b6..9621ac29ec 100644 --- a/django/contrib/admin/static/admin/css/forms.css +++ b/django/contrib/admin/static/admin/css/forms.css @@ -217,7 +217,8 @@ fieldset .fieldBox { /* WIDE FIELDSETS */ -.wide label { +.wide label, +.wide legend { width: 200px; } diff --git a/django/contrib/admin/static/admin/css/rtl.css b/django/contrib/admin/static/admin/css/rtl.css index 713f9f4188..ba4d0bf549 100644 --- a/django/contrib/admin/static/admin/css/rtl.css +++ b/django/contrib/admin/static/admin/css/rtl.css @@ -124,7 +124,8 @@ thead th.sorted .text { /* FORMS */ -.aligned label { +.aligned label, +.aligned legend { padding: 0 0 3px 1em; } diff --git a/docs/releases/6.0.3.txt b/docs/releases/6.0.3.txt index 1dff197d06..3f4972529e 100644 --- a/docs/releases/6.0.3.txt +++ b/docs/releases/6.0.3.txt @@ -15,3 +15,6 @@ Bugfixes * Fixed :exc:`AttributeError` when subclassing builtin lookups and neglecting to :ref:`override` ``as_sql()`` to accept any sequence (:ticket:`36934`). + +* Fixed a visual regression where fieldset legends were misaligned in the admin + (:ticket:`36920`). diff --git a/tests/admin_views/test_password_form.py b/tests/admin_views/test_password_form.py index d448943b04..15f6037d07 100644 --- a/tests/admin_views/test_password_form.py +++ b/tests/admin_views/test_password_form.py @@ -1,6 +1,7 @@ from django.contrib.admin.tests import AdminSeleniumTestCase from django.contrib.auth.models import User from django.test import override_settings +from django.test.selenium import screenshot_cases from django.urls import reverse @@ -142,3 +143,12 @@ class SeleniumAuthTests(AdminSeleniumTestCase): # Only the set password submit button is visible. self.assertIs(submit_set.is_displayed(), True) self.assertIs(submit_unset.is_displayed(), False) + + @screenshot_cases(["desktop_size", "mobile_size", "rtl", "dark", "high_contrast"]) + def test_fieldset_legend_wide_alignment(self): + user_add_url = reverse("auth_test_admin:auth_user_add") + self.admin_login(username="super", password="secret") + self.selenium.get(self.live_server_url + user_add_url) + + # The fieldset legend is aligned with other fields. + self.take_screenshot("fieldset_legend_wide") -- cgit v1.3