From a2736e037a20c10da9b54fa6a8aeca7ed0b4cf2a Mon Sep 17 00:00:00 2001
From: gabalafou <gabriel@fouasnon.com>
Date: Thu, 4 Jan 2024 18:04:24 -0500
Subject: [PATCH 1/2] Fix sticky header

---
 .../theme/pydata_sphinx_theme/layout.html                   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html
index 13ea08afd..324b39884 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html
@@ -67,16 +67,14 @@
     <div class="search-button__search-container">{% include "../components/search-field.html" %}</div>
   </div>
 
-  <header>
   {%- if theme_announcement -%}
     {% include "sections/announcement.html" %}
   {%- endif %}
   {% block docs_navbar %}
-    <div class="bd-header navbar navbar-expand-lg bd-navbar">
+    <header class="bd-header navbar navbar-expand-lg bd-navbar">
       {%- include "sections/header.html" %}
-    </div>
+    </header>
   {% endblock docs_navbar %}
-  </header>
 
   <div class="bd-container">
     <div class="bd-container__inner bd-page-width">

From b4e995e607bbc2b8d2d6413950308cef07fb5dbc Mon Sep 17 00:00:00 2001
From: gabalafou <gabriel@fouasnon.com>
Date: Fri, 5 Jan 2024 14:25:38 -0500
Subject: [PATCH 2/2] regression test

---
 tests/test_build.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/test_build.py b/tests/test_build.py
index 3f312d910..1a2a623aa 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -307,6 +307,13 @@ def test_logo_template_rejected(sphinx_build_factory) -> None:
         sphinx_build_factory("base", confoverrides=confoverrides).build()
 
 
+def test_sticky_header(sphinx_build_factory):
+    """Regression test, see #1630. Sticky header should be direct descendant of body."""
+    sphinx_build = sphinx_build_factory("test_navbar_no_in_page_headers").build()
+    index_html = sphinx_build.html_tree("index.html")
+    assert index_html.select_one("body > .bd-header")
+
+
 @pytest.mark.parametrize(
     "align,klass",
     [