From 814e7bc22062eeae4be9f189e89027e28d5dd290 Mon Sep 17 00:00:00 2001
From: Sarah Abderemane <sarahabderemane@gmail.com>
Date: Wed, 13 Sep 2023 21:25:02 +0200
Subject: [PATCH] Fixed #34832 -- Made admin's header content render in
 <header> tag.

Header tag was changed to <header> get the landmark banner for
accessibility.
---
 AUTHORS                                        | 1 +
 django/contrib/admin/static/admin/css/base.css | 5 -----
 django/contrib/admin/templates/admin/base.html | 4 ++--
 docs/releases/5.0.txt                          | 5 +++--
 tests/admin_views/tests.py                     | 7 +++++++
 5 files changed, 13 insertions(+), 9 deletions(-)

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 <sander.dijkhuis@gmail.com>
     Sanket Saurav <sanketsaurav@gmail.com>
     Sanyam Khurana <sanyam.khurana01@gmail.com>
+    Sarah Abderemane <https://github.com/sabderemane>
     Sarah Boyce <https://github.com/sarahboyce>
     Sarthak Mehrish <sarthakmeh03@gmail.com>
     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 %}
     <!-- Header -->
     {% block header %}
-    <div id="header">
+      <header id="header">
         <div id="branding">
         {% block branding %}{% endblock %}
         </div>
@@ -66,7 +66,7 @@
         {% endif %}
         {% endblock %}
         {% block nav-global %}{% endblock %}
-    </div>
+      </header>
     {% endblock %}
     <!-- END Header -->
     {% 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 ``<h1>`` 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 ``<main>`` tag instead of ``<div>``.
+* In order to improve accessibility, the admin's main content area and header
+  content area are now rendered in a ``<main>`` and ``<header>`` tag instead of
+  ``<div>``.
 
 * 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):
             '<meta name="viewport" content="width=device-width, initial-scale=1.0">',
         )
 
+    def test_header(self):
+        response = self.client.get(reverse("admin:index"))
+        self.assertContains(response, '<header id="header">')
+        self.client.logout()
+        response = self.client.get(reverse("admin:login"))
+        self.assertContains(response, '<header id="header">')
+
 
 @override_settings(
     AUTH_PASSWORD_VALIDATORS=[