From 2fbce3474833a78d51144fb5f0181ced2f6bdf28 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Fri, 26 Aug 2022 23:50:16 +0200
Subject: [PATCH 1/3] ENH: Add section title to sidebar navigation

---
 .../styles/components/_navbar-links.scss      |  5 +++
 .../styles/sections/_sidebar-primary.scss     | 10 ++++-
 .../components/navbar-nav.html                | 11 +++--
 .../components/sidebar-nav-bs.html            |  3 ++
 .../sections/sidebar-primary.html             |  3 --
 tests/test_build/navbar_ix.html               | 39 +++++++++-------
 tests/test_build/sidebar_subpage.html         | 45 ++++++++++---------
 tests/test_build/test_sidebars_captions.html  |  3 ++
 .../test_build/test_sidebars_nested_page.html |  3 ++
 9 files changed, 77 insertions(+), 45 deletions(-)

diff --git a/src/pydata_sphinx_theme/assets/styles/components/_navbar-links.scss b/src/pydata_sphinx_theme/assets/styles/components/_navbar-links.scss
index 5b22845d0..2493fc883 100644
--- a/src/pydata_sphinx_theme/assets/styles/components/_navbar-links.scss
+++ b/src/pydata_sphinx_theme/assets/styles/components/_navbar-links.scss
@@ -68,3 +68,8 @@
     }
   }
 }
+
+// Don't display the `site navigation` in the header menu
+.bd-header .navbar-nav > p.sidebar-header-items__title {
+  display: none;
+}
diff --git a/src/pydata_sphinx_theme/assets/styles/sections/_sidebar-primary.scss b/src/pydata_sphinx_theme/assets/styles/sections/_sidebar-primary.scss
index 714c8bde4..6ce31e20f 100644
--- a/src/pydata_sphinx_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/pydata_sphinx_theme/assets/styles/sections/_sidebar-primary.scss
@@ -36,7 +36,7 @@
 
   .sidebar-start-items__item,
   .sidebar-end-items__item {
-    padding: 0.25rem 0;
+    padding: 0.5rem 0;
   }
 
   // Hide the sidebar header items on widescreen since they are visible in the header
@@ -202,9 +202,15 @@ nav.bd-links {
     }
   }
 
+  // Title
+  p.bd-links__title {
+    font-size: var(--pst-sidebar-header-font-size);
+    font-weight: var(--pst-sidebar-header-font-weight);
+    margin-bottom: 0.5rem;
+  }
+
   // Toctree captions
   p.caption {
-    font-size: var(--pst-sidebar-header-font-size);
     font-weight: var(--pst-sidebar-header-font-weight);
     position: relative;
     margin-top: 1.25em;
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/navbar-nav.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/navbar-nav.html
index d4a41ed6a..4fa900557 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/navbar-nav.html
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/navbar-nav.html
@@ -1,3 +1,8 @@
-<ul id="navbar-main-elements" class="navbar-nav">
-    {{ generate_header_nav_html(n_links_before_dropdown=theme_header_links_before_dropdown) }}
-</ul>
+<nav class="navbar-nav">
+    <p class="sidebar-header-items__title" role="heading" aria-level="1" aria-label="{{ _('Site Navigation') }}">
+        {{ _("Site Navigation") }}
+    </p>
+    <ul id="navbar-main-elements" class="navbar-nav">
+        {{ generate_header_nav_html(n_links_before_dropdown=theme_header_links_before_dropdown) }}
+    </ul>
+</nav>
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/sidebar-nav-bs.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/sidebar-nav-bs.html
index d142e34a8..19235ff38 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/sidebar-nav-bs.html
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/components/sidebar-nav-bs.html
@@ -1,4 +1,7 @@
 <nav class="bd-links" id="bd-docs-nav" aria-label="{{ _('Section navigation') }}">
+  <p class="bd-links__title" role="heading" aria-level="1">
+    {{ _("Section Navigation") }}
+  </p>
   <div class="bd-toc-item navbar-nav">
     {{ sidebar_nav_html }}
   </div>
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/sections/sidebar-primary.html b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/sections/sidebar-primary.html
index 461464535..27457510f 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/sections/sidebar-primary.html
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/sections/sidebar-primary.html
@@ -1,9 +1,6 @@
 {% block docs_sidebar %}
   {# Header items that will be displayed in the sidebar on mobile #}
   <div class="sidebar-header-items sidebar-primary__section">
-    <p class="sidebar-header-items__title" role="heading" aria-level="1" aria-label="{{ _('Navigation') }}">
-      {{ _("Site Navigation") }}
-    </p>
     {# The header center items #}
     {% if theme_navbar_center %}
       <div class="sidebar-header-items__center">
diff --git a/tests/test_build/navbar_ix.html b/tests/test_build/navbar_ix.html
index 728caf086..abcb49a79 100644
--- a/tests/test_build/navbar_ix.html
+++ b/tests/test_build/navbar_ix.html
@@ -1,21 +1,26 @@
 <div class="mr-auto" id="navbar-center">
  <div class="navbar-center-item">
-  <ul class="navbar-nav" id="navbar-main-elements">
-   <li class="nav-item">
-    <a class="nav-link" href="page1.html">
-     Page 1
-    </a>
-   </li>
-   <li class="nav-item">
-    <a class="nav-link" href="page2.html">
-     Page 2
-    </a>
-   </li>
-   <li class="nav-item">
-    <a class="nav-link" href="section1/index.html">
-     Section 1 index
-    </a>
-   </li>
-  </ul>
+  <nav class="navbar-nav">
+   <p aria-label="Site Navigation" aria-level="1" class="sidebar-header-items__title" role="heading">
+    Site Navigation
+   </p>
+   <ul class="navbar-nav" id="navbar-main-elements">
+    <li class="nav-item">
+     <a class="nav-link" href="page1.html">
+      Page 1
+     </a>
+    </li>
+    <li class="nav-item">
+     <a class="nav-link" href="page2.html">
+      Page 2
+     </a>
+    </li>
+    <li class="nav-item">
+     <a class="nav-link" href="section1/index.html">
+      Section 1 index
+     </a>
+    </li>
+   </ul>
+  </nav>
  </div>
 </div>
diff --git a/tests/test_build/sidebar_subpage.html b/tests/test_build/sidebar_subpage.html
index 52fb5ec2a..20e7ae0fb 100644
--- a/tests/test_build/sidebar_subpage.html
+++ b/tests/test_build/sidebar_subpage.html
@@ -1,27 +1,29 @@
 <div class="bd-sidebar-primary bd-sidebar">
  <div class="sidebar-header-items sidebar-primary__section">
-  <p aria-label="Navigation" aria-level="1" class="sidebar-header-items__title" role="heading">
-   Site Navigation
-  </p>
   <div class="sidebar-header-items__center">
    <div class="navbar-center-item">
-    <ul class="navbar-nav" id="navbar-main-elements">
-     <li class="nav-item">
-      <a class="nav-link" href="../page1.html">
-       Page 1
-      </a>
-     </li>
-     <li class="nav-item">
-      <a class="nav-link" href="../page2.html">
-       Page 2
-      </a>
-     </li>
-     <li class="nav-item current active">
-      <a class="nav-link" href="#">
-       Section 1 index
-      </a>
-     </li>
-    </ul>
+    <nav class="navbar-nav">
+     <p aria-label="Site Navigation" aria-level="1" class="sidebar-header-items__title" role="heading">
+      Site Navigation
+     </p>
+     <ul class="navbar-nav" id="navbar-main-elements">
+      <li class="nav-item">
+       <a class="nav-link" href="../page1.html">
+        Page 1
+       </a>
+      </li>
+      <li class="nav-item">
+       <a class="nav-link" href="../page2.html">
+        Page 2
+       </a>
+      </li>
+      <li class="nav-item current active">
+       <a class="nav-link" href="#">
+        Section 1 index
+       </a>
+      </li>
+     </ul>
+    </nav>
    </div>
   </div>
   <div class="sidebar-header-items__end">
@@ -50,6 +52,9 @@
  <div class="sidebar-start-items sidebar-primary__section">
   <div class="sidebar-start-items__item">
    <nav aria-label="Section navigation" class="bd-links" id="bd-docs-nav">
+    <p aria-level="1" class="bd-links__title" role="heading">
+     Section Navigation
+    </p>
     <div class="bd-toc-item navbar-nav">
      <ul class="nav bd-sidenav">
       <li class="toctree-l1">
diff --git a/tests/test_build/test_sidebars_captions.html b/tests/test_build/test_sidebars_captions.html
index c25a39664..058cf8d7f 100644
--- a/tests/test_build/test_sidebars_captions.html
+++ b/tests/test_build/test_sidebars_captions.html
@@ -1,4 +1,7 @@
 <nav aria-label="Section navigation" class="bd-links" id="bd-docs-nav">
+ <p aria-level="1" class="bd-links__title" role="heading">
+  Section Navigation
+ </p>
  <div class="bd-toc-item navbar-nav">
   <p aria-level="2" class="caption" role="heading">
    <span class="caption-text">
diff --git a/tests/test_build/test_sidebars_nested_page.html b/tests/test_build/test_sidebars_nested_page.html
index 17ae300b8..fd48e93ef 100644
--- a/tests/test_build/test_sidebars_nested_page.html
+++ b/tests/test_build/test_sidebars_nested_page.html
@@ -1,4 +1,7 @@
 <nav aria-label="Section navigation" class="bd-links" id="bd-docs-nav">
+ <p aria-level="1" class="bd-links__title" role="heading">
+  Section Navigation
+ </p>
  <div class="bd-toc-item navbar-nav">
   <p aria-level="2" class="caption" role="heading">
    <span class="caption-text">

From fad2251d88fc55ca8901f8be904abf32341544dc Mon Sep 17 00:00:00 2001
From: Rambaud Pierrick <12rambau@users.noreply.github.com>
Date: Sun, 28 Aug 2022 19:13:43 +0200
Subject: [PATCH 2/3] margin on small screen

---
 .../assets/styles/components/_switcher-version.scss          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss b/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss
index d8febb16f..222dc204d 100644
--- a/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss
+++ b/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss
@@ -1,6 +1,11 @@
 button.version-switcher__button {
   border-color: var(--pst-color-border);
   color: var(--pst-color-text-base);
+  margin-bottom: 1em;
+
+  @include media-breakpoint-up($breakpoint-sidebar-primary) {
+    margin-bottom: none;
+  }
 
   &:hover {
     color: var(--pst-color-text-base);

From 92c0ab4390ca230850c4e684ca6b337668bdfb3b Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Sun, 28 Aug 2022 12:27:48 -0700
Subject: [PATCH 3/3] Update
 src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss

---
 .../assets/styles/components/_switcher-version.scss           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss b/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss
index 222dc204d..dcf0a4f79 100644
--- a/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss
+++ b/src/pydata_sphinx_theme/assets/styles/components/_switcher-version.scss
@@ -1,10 +1,10 @@
 button.version-switcher__button {
   border-color: var(--pst-color-border);
   color: var(--pst-color-text-base);
+  // Add a margin on narrow screens to avoid feeling cramped
   margin-bottom: 1em;
-
   @include media-breakpoint-up($breakpoint-sidebar-primary) {
-    margin-bottom: none;
+    margin-bottom: unset;
   }
 
   &:hover {