diff --git a/AUTHORS b/AUTHORS index 1f51cff05c..c29c717005 100644 --- a/AUTHORS +++ b/AUTHORS @@ -887,6 +887,7 @@ answer newbie questions, and generally made Django that much better: Sander Dijkhuis Sanket Saurav Sanyam Khurana + Sarah Abderemane Sarah Boyce Sarthak Mehrish schwank@gmail.com diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index d7a3cc4fbe..60ab3c7768 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -834,10 +834,6 @@ a.deletelink:focus, a.deletelink:hover { height: 100%; } -#container > div { - flex-shrink: 0; -} - #container > .main { display: flex; flex: 1 0 auto; @@ -922,7 +918,6 @@ a.deletelink:focus, a.deletelink:hover { padding: 10px 40px; background: var(--header-bg); color: var(--header-color); - overflow: hidden; } #header a:link, #header a:visited, #logout-form button { diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index fdbc21a8c8..44fd16ee96 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -32,7 +32,7 @@ {% if not is_popup %} {% block header %} - + {% endblock %} {% block nav-breadcrumbs %} diff --git a/docs/releases/5.0.txt b/docs/releases/5.0.txt index 186768f070..1c17cbfcf5 100644 --- a/docs/releases/5.0.txt +++ b/docs/releases/5.0.txt @@ -629,8 +629,9 @@ Miscellaneous a page. Having two ``

`` elements was confusing and the site header wasn't helpful as it is repeated on all pages. -* In order to improve accessibility, the admin's main content area is now - rendered in a ``
`` tag instead of ``
``. +* In order to improve accessibility, the admin's main content area and header + content area are now rendered in a ``
`` and ``
`` tag instead of + ``
``. * On databases without native support for the SQL ``XOR`` operator, ``^`` as the exclusive or (``XOR``) operator now returns rows that are matched by an diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 26eba69bbd..e7b2519eef 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -1516,6 +1516,13 @@ class AdminViewBasicTest(AdminViewBasicTestCase): '', ) + def test_header(self): + response = self.client.get(reverse("admin:index")) + self.assertContains(response, '