From 47985bbf82bc1c2485312d2cf91f5abb2a87a052 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Tue, 22 Feb 2022 11:00:06 +1100
Subject: [PATCH 01/28] restructuring html for parts

---
 src/pydata_sphinx_theme/__init__.py           | 74 ++++++++++++++++---
 .../theme/pydata_sphinx_theme/theme.conf      |  1 +
 2 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index e1b767053..5e0190955 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -106,12 +106,28 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
 
         soup = bs(toc_sphinx, "html.parser")
 
+        # restructing html to handle part collapsing
+        partcaptions = soup.find_all("p", attrs={"class": "caption"})
+        if len(partcaptions):
+            new_soup = soup.new_tag("div")
+            for caption in partcaptions:
+                for sibling in caption.next_siblings:
+                    if sibling.name == 'ul':
+                        toclist = sibling
+                        break
+                div = soup.new_tag("div", attrs={"class": "toctree-l0"})
+                div.append(caption)
+                div.append(toclist)
+                new_soup.append(div)
+        else:
+            new_soup = soup
+
         # pair "current" with "active" since that's what we use w/ bootstrap
-        for li in soup("li", {"class": "current"}):
+        for li in new_soup("li", {"class": "current"}):
             li["class"].append("active")
 
         # Remove navbar/sidebar links to sub-headers on the page
-        for li in soup.select("li"):
+        for li in new_soup.select("li"):
             # Remove
             if li.find("a"):
                 href = li.find("a")["href"]
@@ -120,30 +136,35 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
 
         if kind == "navbar":
             # Add CSS for bootstrap
-            for li in soup("li"):
+            for li in new_soup("li"):
                 li["class"].append("nav-item")
                 li.find("a")["class"].append("nav-link")
             # only select li items (not eg captions)
-            out = "\n".join([ii.prettify() for ii in soup.find_all("li")])
+            out = "\n".join([ii.prettify() for ii in new_soup.find_all("li")])
 
         elif kind == "sidebar":
             # Add bootstrap classes for first `ul` items
-            for ul in soup("ul", recursive=False):
+            for ul in new_soup("ul", recursive=False):
                 ul.attrs["class"] = ul.attrs.get("class", []) + ["nav", "bd-sidenav"]
 
             # Add icons and labels for collapsible nested sections
-            _add_collapse_checkboxes(soup)
+            _add_collapse_checkboxes(new_soup, context['theme_collapse_parts'])
 
             # Open the navbar to the proper depth
+            # if not int(show_nav_level):
+            #     for tocl in new_soup.select(".toctree-l0"):
+            #         checkbox = tocl.previous_sibling
+            #         checkbox.attrs["checked"] = None
+            # else:
             for ii in range(int(show_nav_level)):
-                for checkbox in soup.select(
+                for checkbox in new_soup.select(
                     f"li.toctree-l{ii} > input.toctree-checkbox"
                 ):
                     checkbox.attrs["checked"] = None
-            out = soup.prettify()
+            out = new_soup.prettify()
 
         elif kind == "raw":
-            out = soup
+            out = new_soup
 
         return out
 
@@ -255,11 +276,44 @@ def generate_google_analytics_script(id):
     context["generate_google_analytics_script"] = generate_google_analytics_script
 
 
-def _add_collapse_checkboxes(soup):
+def _add_collapse_checkboxes(soup, collapse_parts):
     # based on https://github.com/pradyunsg/furo
 
     toctree_checkbox_count = 0
 
+    if collapse_parts:
+        for elem in soup.find_all('p'):
+            classes = elem.get("class", [])
+
+            if not "caption" in classes:
+                return
+            
+            # Add toctree class
+            elem["class"] = classes + ["toctree-l0"]
+            toctree_checkbox_count += 1
+            checkbox_name = f"toctree-checkbox-{toctree_checkbox_count}"
+
+            if soup.new_tag is None:
+                continue
+            label = soup.new_tag("label", attrs={"for": checkbox_name})
+            label.append(soup.new_tag("i", attrs={"class": "fas fa-chevron-down"}))
+            elem.insert(1, label)
+
+            # Add the checkbox that's used to store expanded/collapsed state.
+            checkbox = soup.new_tag(
+                "input",
+                attrs={
+                    "type": "checkbox",
+                    "class": ["toctree-checkbox"],
+                    "id": checkbox_name,
+                    "name": checkbox_name,
+                },
+            )
+
+            if "current" in classes:
+                checkbox.attrs["checked"] = ""
+            elem.insert_before(checkbox)
+
     for element in soup.find_all("li", recursive=True):
         # We check all "li" elements, to add a "current-page" to the correct li.
         classes = element.get("class", [])
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
index 140692947..d1801afa7 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
@@ -34,3 +34,4 @@ left_sidebar_end = sidebar-ethical-ads.html
 footer_items = copyright.html, sphinx-version.html
 page_sidebar_items = page-toc.html, edit-this-page.html
 switcher =
+collapse_parts = True
\ No newline at end of file

From cbcc5c337603c958856ad4d7ebb54dda39337123 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Tue, 22 Feb 2022 14:06:09 +1100
Subject: [PATCH 02/28] added styling and restructured bs html

---
 src/pydata_sphinx_theme/__init__.py           | 103 +++++++++---------
 .../assets/styles/index.scss                  |  72 ++++++------
 2 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 5e0190955..fb90e13d6 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -106,28 +106,12 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
 
         soup = bs(toc_sphinx, "html.parser")
 
-        # restructing html to handle part collapsing
-        partcaptions = soup.find_all("p", attrs={"class": "caption"})
-        if len(partcaptions):
-            new_soup = soup.new_tag("div")
-            for caption in partcaptions:
-                for sibling in caption.next_siblings:
-                    if sibling.name == 'ul':
-                        toclist = sibling
-                        break
-                div = soup.new_tag("div", attrs={"class": "toctree-l0"})
-                div.append(caption)
-                div.append(toclist)
-                new_soup.append(div)
-        else:
-            new_soup = soup
-
         # pair "current" with "active" since that's what we use w/ bootstrap
-        for li in new_soup("li", {"class": "current"}):
+        for li in soup("li", {"class": "current"}):
             li["class"].append("active")
 
         # Remove navbar/sidebar links to sub-headers on the page
-        for li in new_soup.select("li"):
+        for li in soup.select("li"):
             # Remove
             if li.find("a"):
                 href = li.find("a")["href"]
@@ -136,17 +120,33 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
 
         if kind == "navbar":
             # Add CSS for bootstrap
-            for li in new_soup("li"):
+            for li in soup("li"):
                 li["class"].append("nav-item")
                 li.find("a")["class"].append("nav-link")
             # only select li items (not eg captions)
-            out = "\n".join([ii.prettify() for ii in new_soup.find_all("li")])
+            out = "\n".join([ii.prettify() for ii in soup.find_all("li")])
 
         elif kind == "sidebar":
             # Add bootstrap classes for first `ul` items
-            for ul in new_soup("ul", recursive=False):
+            for ul in soup("ul", recursive=False):
                 ul.attrs["class"] = ul.attrs.get("class", []) + ["nav", "bd-sidenav"]
 
+            # restructing html to handle part collapsing
+            partcaptions = soup.find_all("p", attrs={"class": "caption"})
+            if len(partcaptions):
+                new_soup = bs("<ul class='list-caption'></ul>", "html.parser")
+                for caption in partcaptions:
+                    for sibling in caption.next_siblings:
+                        if sibling.name == 'ul':
+                            toclist = sibling
+                            break
+                    li = soup.new_tag("li", attrs={"class": "toctree-l0"})
+                    li.append(caption)
+                    li.append(toclist)
+                    new_soup.ul.append(li)
+            else:
+                new_soup = soup
+
             # Add icons and labels for collapsible nested sections
             _add_collapse_checkboxes(new_soup, context['theme_collapse_parts'])
 
@@ -281,38 +281,38 @@ def _add_collapse_checkboxes(soup, collapse_parts):
 
     toctree_checkbox_count = 0
 
-    if collapse_parts:
-        for elem in soup.find_all('p'):
-            classes = elem.get("class", [])
+    # if collapse_parts:
+    #     for elem in soup.find_all('p'):
+    #         classes = elem.get("class", [])
 
-            if not "caption" in classes:
-                return
+    #         if not "caption" in classes:
+    #             return
             
-            # Add toctree class
-            elem["class"] = classes + ["toctree-l0"]
-            toctree_checkbox_count += 1
-            checkbox_name = f"toctree-checkbox-{toctree_checkbox_count}"
-
-            if soup.new_tag is None:
-                continue
-            label = soup.new_tag("label", attrs={"for": checkbox_name})
-            label.append(soup.new_tag("i", attrs={"class": "fas fa-chevron-down"}))
-            elem.insert(1, label)
-
-            # Add the checkbox that's used to store expanded/collapsed state.
-            checkbox = soup.new_tag(
-                "input",
-                attrs={
-                    "type": "checkbox",
-                    "class": ["toctree-checkbox"],
-                    "id": checkbox_name,
-                    "name": checkbox_name,
-                },
-            )
-
-            if "current" in classes:
-                checkbox.attrs["checked"] = ""
-            elem.insert_before(checkbox)
+    #         # Add toctree class
+    #         elem["class"] = classes + ["toctree-l0"]
+    #         toctree_checkbox_count += 1
+    #         checkbox_name = f"toctree-checkbox-{toctree_checkbox_count}"
+
+    #         if soup.new_tag is None:
+    #             continue
+    #         label = soup.new_tag("label", attrs={"for": checkbox_name})
+    #         label.append(soup.new_tag("i", attrs={"class": "fas fa-chevron-down"}))
+    #         elem.insert(1, label)
+
+    #         # Add the checkbox that's used to store expanded/collapsed state.
+    #         checkbox = soup.new_tag(
+    #             "input",
+    #             attrs={
+    #                 "type": "checkbox",
+    #                 "class": ["toctree-checkbox"],
+    #                 "id": checkbox_name,
+    #                 "name": checkbox_name,
+    #             },
+    #         )
+
+    #         if "current" in classes:
+    #             checkbox.attrs["checked"] = ""
+    #         elem.insert_before(checkbox)
 
     for element in soup.find_all("li", recursive=True):
         # We check all "li" elements, to add a "current-page" to the correct li.
@@ -353,7 +353,6 @@ def _add_collapse_checkboxes(soup, collapse_parts):
 
         element.insert(1, checkbox)
 
-
 def _get_local_toctree_for(
     self: TocTree, indexname: str, docname: str, builder, collapse: bool, **kwargs
 ):
diff --git a/src/pydata_sphinx_theme/assets/styles/index.scss b/src/pydata_sphinx_theme/assets/styles/index.scss
index be386c83f..efc398967 100644
--- a/src/pydata_sphinx_theme/assets/styles/index.scss
+++ b/src/pydata_sphinx_theme/assets/styles/index.scss
@@ -165,34 +165,6 @@ footer {
   }
 }
 
-.bd-sidebar {
-  padding-top: 1em;
-  overflow-y: auto;
-  display: flex;
-  flex-direction: column;
-
-  @include media-breakpoint-up(md) {
-    border-right: 1px solid rgba(0, 0, 0, 0.1);
-
-    @supports (position: -webkit-sticky) or (position: sticky) {
-      position: -webkit-sticky;
-      position: sticky;
-      top: var(--pst-header-height);
-      z-index: 1000;
-      height: calc(100vh - var(--pst-header-height));
-    }
-  }
-
-  &.no-sidebar {
-    border-right: 0;
-  }
-
-  .sidebar-end-items {
-    margin-top: auto;
-    margin-bottom: 1em;
-  }
-}
-
 .bd-links {
   padding-top: 1rem;
   padding-bottom: 1rem;
@@ -522,8 +494,44 @@ nav.bd-links {
 }
 
 .bd-sidebar {
+  padding-top: 1em;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+
+  @include media-breakpoint-up(md) {
+    border-right: 1px solid rgba(0, 0, 0, 0.1);
+
+    @supports (position: -webkit-sticky) or (position: sticky) {
+      position: -webkit-sticky;
+      position: sticky;
+      top: var(--pst-header-height);
+      z-index: 1000;
+      height: calc(100vh - var(--pst-header-height));
+    }
+  }
+
+  &.no-sidebar {
+    border-right: 0;
+  }
+
+  .sidebar-end-items {
+    margin-top: auto;
+    margin-bottom: 1em;
+  }
+  .list-caption {
+    list-style: none;
+    padding-left: 0px;
+  }
   li {
     position: relative;
+    // If it has children, add a bit more padding to wrap the content to avoid
+    // overlapping with the <label>
+    &.has-children {
+      > .reference {
+        padding-right: 30px;
+      }
+    }
   }
   label {
     position: absolute;
@@ -553,14 +561,6 @@ nav.bd-links {
       }
     }
   }
-
-  // If it has children, add a bit more padding to wrap the content to avoid
-  // overlapping with the <label>
-  li.has-children {
-    > .reference {
-      padding-right: 30px;
-    }
-  }
 }
 
 // From https://stackoverflow.com/a/34372191

From c33f15e198dec71ff51bb6e2969e307e4982125f Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Tue, 22 Feb 2022 16:33:35 +1100
Subject: [PATCH 03/28] adding list-caption class

---
 src/pydata_sphinx_theme/__init__.py           | 38 -------------------
 .../assets/styles/index.scss                  |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index fb90e13d6..966717d14 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -151,11 +151,6 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
             _add_collapse_checkboxes(new_soup, context['theme_collapse_parts'])
 
             # Open the navbar to the proper depth
-            # if not int(show_nav_level):
-            #     for tocl in new_soup.select(".toctree-l0"):
-            #         checkbox = tocl.previous_sibling
-            #         checkbox.attrs["checked"] = None
-            # else:
             for ii in range(int(show_nav_level)):
                 for checkbox in new_soup.select(
                     f"li.toctree-l{ii} > input.toctree-checkbox"
@@ -281,39 +276,6 @@ def _add_collapse_checkboxes(soup, collapse_parts):
 
     toctree_checkbox_count = 0
 
-    # if collapse_parts:
-    #     for elem in soup.find_all('p'):
-    #         classes = elem.get("class", [])
-
-    #         if not "caption" in classes:
-    #             return
-            
-    #         # Add toctree class
-    #         elem["class"] = classes + ["toctree-l0"]
-    #         toctree_checkbox_count += 1
-    #         checkbox_name = f"toctree-checkbox-{toctree_checkbox_count}"
-
-    #         if soup.new_tag is None:
-    #             continue
-    #         label = soup.new_tag("label", attrs={"for": checkbox_name})
-    #         label.append(soup.new_tag("i", attrs={"class": "fas fa-chevron-down"}))
-    #         elem.insert(1, label)
-
-    #         # Add the checkbox that's used to store expanded/collapsed state.
-    #         checkbox = soup.new_tag(
-    #             "input",
-    #             attrs={
-    #                 "type": "checkbox",
-    #                 "class": ["toctree-checkbox"],
-    #                 "id": checkbox_name,
-    #                 "name": checkbox_name,
-    #             },
-    #         )
-
-    #         if "current" in classes:
-    #             checkbox.attrs["checked"] = ""
-    #         elem.insert_before(checkbox)
-
     for element in soup.find_all("li", recursive=True):
         # We check all "li" elements, to add a "current-page" to the correct li.
         classes = element.get("class", [])
diff --git a/src/pydata_sphinx_theme/assets/styles/index.scss b/src/pydata_sphinx_theme/assets/styles/index.scss
index efc398967..2485d775e 100644
--- a/src/pydata_sphinx_theme/assets/styles/index.scss
+++ b/src/pydata_sphinx_theme/assets/styles/index.scss
@@ -318,7 +318,7 @@ nav.bd-links {
 
 /* Nav: hide second level (shown on .active) */
 
-.bd-toc .nav {
+.bd-toc .nav, .list-caption {
   .nav {
     display: none;
 

From c267479ce31c2c6bf139dfa9e9c0d5a565ea528c Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Tue, 22 Feb 2022 19:03:09 +1100
Subject: [PATCH 04/28] not adding collapse parts for now

---
 src/pydata_sphinx_theme/__init__.py                          | 4 ++--
 src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 966717d14..f424e4714 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -148,7 +148,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                 new_soup = soup
 
             # Add icons and labels for collapsible nested sections
-            _add_collapse_checkboxes(new_soup, context['theme_collapse_parts'])
+            _add_collapse_checkboxes(new_soup)
 
             # Open the navbar to the proper depth
             for ii in range(int(show_nav_level)):
@@ -271,7 +271,7 @@ def generate_google_analytics_script(id):
     context["generate_google_analytics_script"] = generate_google_analytics_script
 
 
-def _add_collapse_checkboxes(soup, collapse_parts):
+def _add_collapse_checkboxes(soup):
     # based on https://github.com/pradyunsg/furo
 
     toctree_checkbox_count = 0
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
index d1801afa7..7865c4740 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
@@ -33,5 +33,4 @@ navbar_end = navbar-icon-links.html
 left_sidebar_end = sidebar-ethical-ads.html
 footer_items = copyright.html, sphinx-version.html
 page_sidebar_items = page-toc.html, edit-this-page.html
-switcher =
-collapse_parts = True
\ No newline at end of file
+switcher =
\ No newline at end of file

From fc53df7225e3d1063db714cac92afc09586bb742 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Tue, 22 Feb 2022 19:28:57 +1100
Subject: [PATCH 05/28] modified tests

---
 tests/test_build/test_sidebars_captions.html  | 55 +++++++++--------
 tests/test_build/test_sidebars_level2.html    | 40 ++++++++-----
 .../test_build/test_sidebars_nested_page.html | 53 ++++++++++-------
 tests/test_build/test_sidebars_single.html    | 59 ++++++++++++-------
 4 files changed, 126 insertions(+), 81 deletions(-)

diff --git a/tests/test_build/test_sidebars_captions.html b/tests/test_build/test_sidebars_captions.html
index 7580dd856..43adf1669 100644
--- a/tests/test_build/test_sidebars_captions.html
+++ b/tests/test_build/test_sidebars_captions.html
@@ -1,39 +1,48 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
-  <p aria-level="2" class="caption" role="heading">
-   <span class="caption-text">
-    Section 1
-   </span>
-  </p>
-  <ul class="nav bd-sidenav">
-   <li class="toctree-l1 has-children">
-    <a class="reference internal" href="subsection1/index.html">
-     Subsection 1.1 index
-    </a>
-    <input class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
+  <ul class="list-caption">
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Section 1
+     </span>
+    </p>
+    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
      <label for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
-     <ul>
-      <li class="toctree-l2">
-       <a class="reference internal" href="subsection1/page1.html">
-        Section 1 sub 1 page 1
+     <ul class="nav bd-sidenav">
+      <li class="toctree-l1 has-children">
+       <a class="reference internal" href="subsection1/index.html">
+        Subsection 1.1 index
        </a>
+       <input class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
+       <label for="toctree-checkbox-2">
+        <i class="fas fa-chevron-down">
+        </i>
+       </label>
+       <ul>
+        <li class="toctree-l2">
+         <a class="reference internal" href="subsection1/page1.html">
+          Section 1 sub 1 page 1
+         </a>
+        </li>
+        <li class="toctree-l2">
+         <a class="reference internal" href="subsection1/page2.html">
+          Section 1 sub 1 page 2
+         </a>
+        </li>
+       </ul>
       </li>
-      <li class="toctree-l2">
-       <a class="reference internal" href="subsection1/page2.html">
-        Section 1 sub 1 page 2
+      <li class="toctree-l1">
+       <a class="reference internal" href="page2.html">
+        Section 1 page 1
        </a>
       </li>
      </ul>
     </input>
    </li>
-   <li class="toctree-l1">
-    <a class="reference internal" href="page2.html">
-     Section 1 page 1
-    </a>
-   </li>
   </ul>
  </div>
 </nav>
diff --git a/tests/test_build/test_sidebars_level2.html b/tests/test_build/test_sidebars_level2.html
index 850e00577..a9281b082 100644
--- a/tests/test_build/test_sidebars_level2.html
+++ b/tests/test_build/test_sidebars_level2.html
@@ -1,21 +1,31 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
   <!-- Use deeper level for sidebar -->
-  <p aria-level="2" class="caption" role="heading">
-   <span class="caption-text">
-    Subsection 1.1
-   </span>
-  </p>
-  <ul class="nav bd-sidenav">
-   <li class="toctree-l1">
-    <a class="reference internal" href="page1.html">
-     Section 1 sub 1 page 1
-    </a>
-   </li>
-   <li class="toctree-l1">
-    <a class="reference internal" href="page2.html">
-     Section 1 sub 1 page 2
-    </a>
+  <ul class="list-caption">
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Subsection 1.1
+     </span>
+    </p>
+    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
+     <label for="toctree-checkbox-1">
+      <i class="fas fa-chevron-down">
+      </i>
+     </label>
+     <ul class="nav bd-sidenav">
+      <li class="toctree-l1">
+       <a class="reference internal" href="page1.html">
+        Section 1 sub 1 page 1
+       </a>
+      </li>
+      <li class="toctree-l1">
+       <a class="reference internal" href="page2.html">
+        Section 1 sub 1 page 2
+       </a>
+      </li>
+     </ul>
+    </input>
    </li>
   </ul>
  </div>
diff --git a/tests/test_build/test_sidebars_nested_page.html b/tests/test_build/test_sidebars_nested_page.html
index fd682e203..460a6fdbb 100644
--- a/tests/test_build/test_sidebars_nested_page.html
+++ b/tests/test_build/test_sidebars_nested_page.html
@@ -1,39 +1,48 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
-  <p aria-level="2" class="caption" role="heading">
-   <span class="caption-text">
-    Section 1
-   </span>
-  </p>
-  <ul class="current nav bd-sidenav">
-   <li class="toctree-l1 current active has-children">
-    <a class="reference internal" href="index.html">
-     Subsection 1.1 index
-    </a>
+  <ul class="list-caption">
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Section 1
+     </span>
+    </p>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
      <label for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
-     <ul class="current">
-      <li class="toctree-l2 current active">
-       <a class="current reference internal" href="#">
-        Section 1 sub 1 page 1
+     <ul class="current nav bd-sidenav">
+      <li class="toctree-l1 current active has-children">
+       <a class="reference internal" href="index.html">
+        Subsection 1.1 index
        </a>
+       <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
+       <label for="toctree-checkbox-2">
+        <i class="fas fa-chevron-down">
+        </i>
+       </label>
+       <ul class="current">
+        <li class="toctree-l2 current active">
+         <a class="current reference internal" href="#">
+          Section 1 sub 1 page 1
+         </a>
+        </li>
+        <li class="toctree-l2">
+         <a class="reference internal" href="page2.html">
+          Section 1 sub 1 page 2
+         </a>
+        </li>
+       </ul>
       </li>
-      <li class="toctree-l2">
-       <a class="reference internal" href="page2.html">
-        Section 1 sub 1 page 2
+      <li class="toctree-l1">
+       <a class="reference internal" href="../page2.html">
+        Section 1 page 1
        </a>
       </li>
      </ul>
     </input>
    </li>
-   <li class="toctree-l1">
-    <a class="reference internal" href="../page2.html">
-     Section 1 page 1
-    </a>
-   </li>
   </ul>
  </div>
 </nav>
diff --git a/tests/test_build/test_sidebars_single.html b/tests/test_build/test_sidebars_single.html
index efe243d38..932f4b7f1 100644
--- a/tests/test_build/test_sidebars_single.html
+++ b/tests/test_build/test_sidebars_single.html
@@ -1,28 +1,45 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
   <!-- Specify a startdepth of 0 instead of default of 1 -->
-  <p aria-level="2" class="caption" role="heading">
-   <span class="caption-text">
-    Caption 1
-   </span>
-  </p>
-  <ul class="nav bd-sidenav">
-   <li class="toctree-l1">
-    <a class="reference internal" href="section1/index.html">
-     Section 1 index
-    </a>
+  <ul class="list-caption">
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Caption 1
+     </span>
+    </p>
+    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
+     <label for="toctree-checkbox-1">
+      <i class="fas fa-chevron-down">
+      </i>
+     </label>
+     <ul class="nav bd-sidenav">
+      <li class="toctree-l1">
+       <a class="reference internal" href="section1/index.html">
+        Section 1 index
+       </a>
+      </li>
+     </ul>
+    </input>
    </li>
-  </ul>
-  <p aria-level="2" class="caption" role="heading">
-   <span class="caption-text">
-    Caption 2
-   </span>
-  </p>
-  <ul class="nav bd-sidenav">
-   <li class="toctree-l1">
-    <a class="reference internal" href="section2/index.html">
-     Section 2 index
-    </a>
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Caption 2
+     </span>
+    </p>
+    <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
+    <label for="toctree-checkbox-2">
+     <i class="fas fa-chevron-down">
+     </i>
+    </label>
+    <ul class="nav bd-sidenav">
+     <li class="toctree-l1">
+      <a class="reference internal" href="section2/index.html">
+       Section 2 index
+      </a>
+     </li>
+    </ul>
    </li>
   </ul>
  </div>

From c54dfb47b9dc78b8e7159e7562f5db5019f11639 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Tue, 22 Feb 2022 23:45:53 +1100
Subject: [PATCH 06/28] pre-commit

---
 src/pydata_sphinx_theme/__init__.py                      | 9 +++++++--
 src/pydata_sphinx_theme/assets/styles/index.scss         | 3 ++-
 .../theme/pydata_sphinx_theme/theme.conf                 | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index f424e4714..f0d852587 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -137,7 +137,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                 new_soup = bs("<ul class='list-caption'></ul>", "html.parser")
                 for caption in partcaptions:
                     for sibling in caption.next_siblings:
-                        if sibling.name == 'ul':
+                        if sibling.name == "ul":
                             toclist = sibling
                             break
                     li = soup.new_tag("li", attrs={"class": "toctree-l0"})
@@ -151,11 +151,15 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
             _add_collapse_checkboxes(new_soup)
 
             # Open the navbar to the proper depth
-            for ii in range(int(show_nav_level)):
+            ii = 0
+            while True:
+                ii += 1
                 for checkbox in new_soup.select(
                     f"li.toctree-l{ii} > input.toctree-checkbox"
                 ):
                     checkbox.attrs["checked"] = None
+                if ii >= int(show_nav_level):
+                    break
             out = new_soup.prettify()
 
         elif kind == "raw":
@@ -315,6 +319,7 @@ def _add_collapse_checkboxes(soup):
 
         element.insert(1, checkbox)
 
+
 def _get_local_toctree_for(
     self: TocTree, indexname: str, docname: str, builder, collapse: bool, **kwargs
 ):
diff --git a/src/pydata_sphinx_theme/assets/styles/index.scss b/src/pydata_sphinx_theme/assets/styles/index.scss
index 2485d775e..e36a3e0c0 100644
--- a/src/pydata_sphinx_theme/assets/styles/index.scss
+++ b/src/pydata_sphinx_theme/assets/styles/index.scss
@@ -318,7 +318,8 @@ nav.bd-links {
 
 /* Nav: hide second level (shown on .active) */
 
-.bd-toc .nav, .list-caption {
+.bd-toc .nav,
+.list-caption {
   .nav {
     display: none;
 
diff --git a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
index 7865c4740..140692947 100644
--- a/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
+++ b/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/theme.conf
@@ -33,4 +33,4 @@ navbar_end = navbar-icon-links.html
 left_sidebar_end = sidebar-ethical-ads.html
 footer_items = copyright.html, sphinx-version.html
 page_sidebar_items = page-toc.html, edit-this-page.html
-switcher =
\ No newline at end of file
+switcher =

From dcf9c2c5e53d6f7039a40b07116ffc516f70f17c Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 23 Feb 2022 11:06:46 +1100
Subject: [PATCH 07/28] Update src/pydata_sphinx_theme/__init__.py

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/pydata_sphinx_theme/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index f0d852587..1dd67a347 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -131,7 +131,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
             for ul in soup("ul", recursive=False):
                 ul.attrs["class"] = ul.attrs.get("class", []) + ["nav", "bd-sidenav"]
 
-            # restructing html to handle part collapsing
+            # Add collapse boxes for parts/captions
             partcaptions = soup.find_all("p", attrs={"class": "caption"})
             if len(partcaptions):
                 new_soup = bs("<ul class='list-caption'></ul>", "html.parser")

From 66982036bb6fe705ce10c19755076f759353799b Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Wed, 23 Feb 2022 11:23:08 +1100
Subject: [PATCH 08/28] opening captions explicitly

---
 src/pydata_sphinx_theme/__init__.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index f0d852587..8cf755f3c 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -151,15 +151,11 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
             _add_collapse_checkboxes(new_soup)
 
             # Open the navbar to the proper depth
-            ii = 0
-            while True:
-                ii += 1
-                for checkbox in new_soup.select(
+            for ii in range(int(show_nav_level)):
+                for checkbox in soup.select(
                     f"li.toctree-l{ii} > input.toctree-checkbox"
                 ):
                     checkbox.attrs["checked"] = None
-                if ii >= int(show_nav_level):
-                    break
             out = new_soup.prettify()
 
         elif kind == "raw":
@@ -284,6 +280,14 @@ def _add_collapse_checkboxes(soup):
         # We check all "li" elements, to add a "current-page" to the correct li.
         classes = element.get("class", [])
 
+        
+        # expanding the parent part explicitly, if present
+        if "current" in classes:
+            parentli = element.find_parent("li", class_="toctree-l0")
+            if parentli:
+                caption = parentli.find("p", class_="caption")
+                caption.find_next_sibling("input").attrs["checked"] = ""
+                
         # Nothing more to do, unless this has "children"
         if not element.find("ul"):
             continue
@@ -312,6 +316,7 @@ def _add_collapse_checkboxes(soup):
                 "name": checkbox_name,
             },
         )
+
         # if this has a "current" class, be expanded by default
         # (by checking the checkbox)
         if "current" in classes:

From 37611693631fb0062e3106e0b1f89dd75b0ec84a Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Wed, 23 Feb 2022 16:45:47 +1100
Subject: [PATCH 09/28] making parts text clickable

---
 src/pydata_sphinx_theme/__init__.py              |  6 +++++-
 src/pydata_sphinx_theme/assets/styles/index.scss | 10 ++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 7baafee69..0ef7b451e 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -286,7 +286,7 @@ def _add_collapse_checkboxes(soup):
             parentli = element.find_parent("li", class_="toctree-l0")
             if parentli:
                 caption = parentli.find("p", class_="caption")
-                caption.find_next_sibling("input").attrs["checked"] = ""
+-               caption.find_next_sibling("input").attrs["checked"] = ""
                 
         # Nothing more to do, unless this has "children"
         if not element.find("ul"):
@@ -302,8 +302,12 @@ def _add_collapse_checkboxes(soup):
         # Add the "label" for the checkbox which will get filled.
         if soup.new_tag is None:
             continue
+
         label = soup.new_tag("label", attrs={"for": checkbox_name})
         label.append(soup.new_tag("i", attrs={"class": "fas fa-chevron-down"}))
+        if "toctree-l0" in classes:
+            # making label cover the whole caption text with css
+            label["class"] = "label-parts"
         element.insert(1, label)
 
         # Add the checkbox that's used to store expanded/collapsed state.
diff --git a/src/pydata_sphinx_theme/assets/styles/index.scss b/src/pydata_sphinx_theme/assets/styles/index.scss
index e36a3e0c0..47133089a 100644
--- a/src/pydata_sphinx_theme/assets/styles/index.scss
+++ b/src/pydata_sphinx_theme/assets/styles/index.scss
@@ -562,6 +562,16 @@ nav.bd-links {
       }
     }
   }
+  .label-parts {
+    width: 100%;
+    justify-content: right;
+    &:hover {
+      background: none;
+    }
+    i {
+      width: 30px;
+    }
+  }
 }
 
 // From https://stackoverflow.com/a/34372191

From ef8716387625de3bd238b01f95c79675046979ba Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Wed, 23 Feb 2022 16:54:15 +1100
Subject: [PATCH 10/28] style for part label

---
 src/pydata_sphinx_theme/__init__.py              | 2 +-
 src/pydata_sphinx_theme/assets/styles/index.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 0ef7b451e..2d187ef36 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -286,7 +286,7 @@ def _add_collapse_checkboxes(soup):
             parentli = element.find_parent("li", class_="toctree-l0")
             if parentli:
                 caption = parentli.find("p", class_="caption")
--               caption.find_next_sibling("input").attrs["checked"] = ""
+                caption.find_next_sibling("input").attrs["checked"] = ""
                 
         # Nothing more to do, unless this has "children"
         if not element.find("ul"):
diff --git a/src/pydata_sphinx_theme/assets/styles/index.scss b/src/pydata_sphinx_theme/assets/styles/index.scss
index 47133089a..76f02e94a 100644
--- a/src/pydata_sphinx_theme/assets/styles/index.scss
+++ b/src/pydata_sphinx_theme/assets/styles/index.scss
@@ -565,6 +565,7 @@ nav.bd-links {
   .label-parts {
     width: 100%;
     justify-content: right;
+    top: -0.25em; // aligning chevron with text
     &:hover {
       background: none;
     }

From 67c4c2f69ed2d39b4449a4d2bbf8c7b4b1292df9 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Wed, 23 Feb 2022 16:55:06 +1100
Subject: [PATCH 11/28] pre-commit

---
 src/pydata_sphinx_theme/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 2d187ef36..5c7f937a9 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -280,14 +280,13 @@ def _add_collapse_checkboxes(soup):
         # We check all "li" elements, to add a "current-page" to the correct li.
         classes = element.get("class", [])
 
-        
         # expanding the parent part explicitly, if present
         if "current" in classes:
             parentli = element.find_parent("li", class_="toctree-l0")
             if parentli:
                 caption = parentli.find("p", class_="caption")
                 caption.find_next_sibling("input").attrs["checked"] = ""
-                
+
         # Nothing more to do, unless this has "children"
         if not element.find("ul"):
             continue

From 3785a473b8b268dc6a78c65f86710fd1aec5bd26 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Wed, 23 Feb 2022 17:22:26 +1100
Subject: [PATCH 12/28] corrections in __init__ and tests

---
 src/pydata_sphinx_theme/__init__.py             | 2 +-
 tests/test_build/test_sidebars_captions.html    | 2 +-
 tests/test_build/test_sidebars_level2.html      | 2 +-
 tests/test_build/test_sidebars_nested_page.html | 2 +-
 tests/test_build/test_sidebars_single.html      | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 5c7f937a9..8f6197d66 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -152,7 +152,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
 
             # Open the navbar to the proper depth
             for ii in range(int(show_nav_level)):
-                for checkbox in soup.select(
+                for checkbox in new_soup.select(
                     f"li.toctree-l{ii} > input.toctree-checkbox"
                 ):
                     checkbox.attrs["checked"] = None
diff --git a/tests/test_build/test_sidebars_captions.html b/tests/test_build/test_sidebars_captions.html
index 43adf1669..860cb0aa3 100644
--- a/tests/test_build/test_sidebars_captions.html
+++ b/tests/test_build/test_sidebars_captions.html
@@ -8,7 +8,7 @@
      </span>
     </p>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label for="toctree-checkbox-1">
+     <label class="label-parts" for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
diff --git a/tests/test_build/test_sidebars_level2.html b/tests/test_build/test_sidebars_level2.html
index a9281b082..fad66ec83 100644
--- a/tests/test_build/test_sidebars_level2.html
+++ b/tests/test_build/test_sidebars_level2.html
@@ -9,7 +9,7 @@
      </span>
     </p>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label for="toctree-checkbox-1">
+     <label class="label-parts" for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
diff --git a/tests/test_build/test_sidebars_nested_page.html b/tests/test_build/test_sidebars_nested_page.html
index 460a6fdbb..18a855ff8 100644
--- a/tests/test_build/test_sidebars_nested_page.html
+++ b/tests/test_build/test_sidebars_nested_page.html
@@ -8,7 +8,7 @@
      </span>
     </p>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label for="toctree-checkbox-1">
+     <label class="label-parts" for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
diff --git a/tests/test_build/test_sidebars_single.html b/tests/test_build/test_sidebars_single.html
index 932f4b7f1..ea0f83b19 100644
--- a/tests/test_build/test_sidebars_single.html
+++ b/tests/test_build/test_sidebars_single.html
@@ -9,7 +9,7 @@
      </span>
     </p>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label for="toctree-checkbox-1">
+     <label class="label-parts" for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
@@ -29,7 +29,7 @@
      </span>
     </p>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
-    <label for="toctree-checkbox-2">
+    <label class="label-parts" for="toctree-checkbox-2">
      <i class="fas fa-chevron-down">
      </i>
     </label>

From cce1bf9c2d243d8f8c31981ef34f746b8506e537 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Fri, 25 Feb 2022 10:01:29 +1100
Subject: [PATCH 13/28] adding docs for show_nav_levek: 0

---
 docs/user_guide/configuring.rst     | 14 ++++++++++++++
 src/pydata_sphinx_theme/__init__.py |  1 +
 2 files changed, 15 insertions(+)

diff --git a/docs/user_guide/configuring.rst b/docs/user_guide/configuring.rst
index d4f6b9ff8..f8a73f0c8 100644
--- a/docs/user_guide/configuring.rst
+++ b/docs/user_guide/configuring.rst
@@ -272,6 +272,20 @@ default, you can use the following configuration in ``conf.py``:
 This will make the first two navigations show up by default (AKA, top-level
 pages and their immediate children).
 
+If your pages are divided into parts, you can also hide the pages
+and make only the caption text of parts visible by using:
+
+.. code:: python
+
+   html_theme_options = {
+      "show_nav_level": 0
+   }
+
+.. note::
+
+   `"show_nav_level": 0` only works for parts and will behave the same as the
+   default value `1`, if the pages are not divided into parts.
+
 .. _remove_toctrees:
 
 Selectively remove pages from your sidebar
diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 8f6197d66..3ae36956b 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -132,6 +132,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                 ul.attrs["class"] = ul.attrs.get("class", []) + ["nav", "bd-sidenav"]
 
             # Add collapse boxes for parts/captions
+
             partcaptions = soup.find_all("p", attrs={"class": "caption"})
             if len(partcaptions):
                 new_soup = bs("<ul class='list-caption'></ul>", "html.parser")

From 63acd91f7eb2526d8849250f85d44519dd115c58 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Fri, 25 Feb 2022 10:57:51 +1100
Subject: [PATCH 14/28] parts collapse only when show_nav_level: 0

---
 src/pydata_sphinx_theme/__init__.py | 31 ++++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 3ae36956b..d1ac3ee5a 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -131,20 +131,23 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
             for ul in soup("ul", recursive=False):
                 ul.attrs["class"] = ul.attrs.get("class", []) + ["nav", "bd-sidenav"]
 
-            # Add collapse boxes for parts/captions
-
-            partcaptions = soup.find_all("p", attrs={"class": "caption"})
-            if len(partcaptions):
-                new_soup = bs("<ul class='list-caption'></ul>", "html.parser")
-                for caption in partcaptions:
-                    for sibling in caption.next_siblings:
-                        if sibling.name == "ul":
-                            toclist = sibling
-                            break
-                    li = soup.new_tag("li", attrs={"class": "toctree-l0"})
-                    li.append(caption)
-                    li.append(toclist)
-                    new_soup.ul.append(li)
+            # Add collapse boxes for parts/captions.
+            # show_nav_level: 0 means make parts collapsible.
+            if not show_nav_level:
+                partcaptions = soup.find_all("p", attrs={"class": "caption"})
+                if len(partcaptions):
+                    new_soup = bs("<ul class='list-caption'></ul>", "html.parser")
+                    for caption in partcaptions:
+                        for sibling in caption.next_siblings:
+                            if sibling.name == "ul":
+                                toclist = sibling
+                                break
+                        li = soup.new_tag("li", attrs={"class": "toctree-l0"})
+                        li.append(caption)
+                        li.append(toclist)
+                        new_soup.ul.append(li)
+                else:
+                    new_soup = soup
             else:
                 new_soup = soup
 

From cd7ecb3944936b8a780ce659ac7712154adcfef5 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Fri, 25 Feb 2022 11:42:59 +1100
Subject: [PATCH 15/28] tests update

---
 tests/test_build/test_sidebars_captions.html  | 57 ++++++++----------
 tests/test_build/test_sidebars_level2.html    | 40 +++++--------
 .../test_build/test_sidebars_nested_page.html | 55 ++++++++---------
 tests/test_build/test_sidebars_single.html    | 59 +++++++------------
 4 files changed, 83 insertions(+), 128 deletions(-)

diff --git a/tests/test_build/test_sidebars_captions.html b/tests/test_build/test_sidebars_captions.html
index 860cb0aa3..7580dd856 100644
--- a/tests/test_build/test_sidebars_captions.html
+++ b/tests/test_build/test_sidebars_captions.html
@@ -1,48 +1,39 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
-  <ul class="list-caption">
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Section 1
-     </span>
-    </p>
-    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label class="label-parts" for="toctree-checkbox-1">
+  <p aria-level="2" class="caption" role="heading">
+   <span class="caption-text">
+    Section 1
+   </span>
+  </p>
+  <ul class="nav bd-sidenav">
+   <li class="toctree-l1 has-children">
+    <a class="reference internal" href="subsection1/index.html">
+     Subsection 1.1 index
+    </a>
+    <input class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
+     <label for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
-     <ul class="nav bd-sidenav">
-      <li class="toctree-l1 has-children">
-       <a class="reference internal" href="subsection1/index.html">
-        Subsection 1.1 index
+     <ul>
+      <li class="toctree-l2">
+       <a class="reference internal" href="subsection1/page1.html">
+        Section 1 sub 1 page 1
        </a>
-       <input class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
-       <label for="toctree-checkbox-2">
-        <i class="fas fa-chevron-down">
-        </i>
-       </label>
-       <ul>
-        <li class="toctree-l2">
-         <a class="reference internal" href="subsection1/page1.html">
-          Section 1 sub 1 page 1
-         </a>
-        </li>
-        <li class="toctree-l2">
-         <a class="reference internal" href="subsection1/page2.html">
-          Section 1 sub 1 page 2
-         </a>
-        </li>
-       </ul>
       </li>
-      <li class="toctree-l1">
-       <a class="reference internal" href="page2.html">
-        Section 1 page 1
+      <li class="toctree-l2">
+       <a class="reference internal" href="subsection1/page2.html">
+        Section 1 sub 1 page 2
        </a>
       </li>
      </ul>
     </input>
    </li>
+   <li class="toctree-l1">
+    <a class="reference internal" href="page2.html">
+     Section 1 page 1
+    </a>
+   </li>
   </ul>
  </div>
 </nav>
diff --git a/tests/test_build/test_sidebars_level2.html b/tests/test_build/test_sidebars_level2.html
index fad66ec83..850e00577 100644
--- a/tests/test_build/test_sidebars_level2.html
+++ b/tests/test_build/test_sidebars_level2.html
@@ -1,31 +1,21 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
   <!-- Use deeper level for sidebar -->
-  <ul class="list-caption">
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Subsection 1.1
-     </span>
-    </p>
-    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label class="label-parts" for="toctree-checkbox-1">
-      <i class="fas fa-chevron-down">
-      </i>
-     </label>
-     <ul class="nav bd-sidenav">
-      <li class="toctree-l1">
-       <a class="reference internal" href="page1.html">
-        Section 1 sub 1 page 1
-       </a>
-      </li>
-      <li class="toctree-l1">
-       <a class="reference internal" href="page2.html">
-        Section 1 sub 1 page 2
-       </a>
-      </li>
-     </ul>
-    </input>
+  <p aria-level="2" class="caption" role="heading">
+   <span class="caption-text">
+    Subsection 1.1
+   </span>
+  </p>
+  <ul class="nav bd-sidenav">
+   <li class="toctree-l1">
+    <a class="reference internal" href="page1.html">
+     Section 1 sub 1 page 1
+    </a>
+   </li>
+   <li class="toctree-l1">
+    <a class="reference internal" href="page2.html">
+     Section 1 sub 1 page 2
+    </a>
    </li>
   </ul>
  </div>
diff --git a/tests/test_build/test_sidebars_nested_page.html b/tests/test_build/test_sidebars_nested_page.html
index 18a855ff8..fd682e203 100644
--- a/tests/test_build/test_sidebars_nested_page.html
+++ b/tests/test_build/test_sidebars_nested_page.html
@@ -1,48 +1,39 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
-  <ul class="list-caption">
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Section 1
-     </span>
-    </p>
+  <p aria-level="2" class="caption" role="heading">
+   <span class="caption-text">
+    Section 1
+   </span>
+  </p>
+  <ul class="current nav bd-sidenav">
+   <li class="toctree-l1 current active has-children">
+    <a class="reference internal" href="index.html">
+     Subsection 1.1 index
+    </a>
     <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label class="label-parts" for="toctree-checkbox-1">
+     <label for="toctree-checkbox-1">
       <i class="fas fa-chevron-down">
       </i>
      </label>
-     <ul class="current nav bd-sidenav">
-      <li class="toctree-l1 current active has-children">
-       <a class="reference internal" href="index.html">
-        Subsection 1.1 index
+     <ul class="current">
+      <li class="toctree-l2 current active">
+       <a class="current reference internal" href="#">
+        Section 1 sub 1 page 1
        </a>
-       <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
-       <label for="toctree-checkbox-2">
-        <i class="fas fa-chevron-down">
-        </i>
-       </label>
-       <ul class="current">
-        <li class="toctree-l2 current active">
-         <a class="current reference internal" href="#">
-          Section 1 sub 1 page 1
-         </a>
-        </li>
-        <li class="toctree-l2">
-         <a class="reference internal" href="page2.html">
-          Section 1 sub 1 page 2
-         </a>
-        </li>
-       </ul>
       </li>
-      <li class="toctree-l1">
-       <a class="reference internal" href="../page2.html">
-        Section 1 page 1
+      <li class="toctree-l2">
+       <a class="reference internal" href="page2.html">
+        Section 1 sub 1 page 2
        </a>
       </li>
      </ul>
     </input>
    </li>
+   <li class="toctree-l1">
+    <a class="reference internal" href="../page2.html">
+     Section 1 page 1
+    </a>
+   </li>
   </ul>
  </div>
 </nav>
diff --git a/tests/test_build/test_sidebars_single.html b/tests/test_build/test_sidebars_single.html
index ea0f83b19..efe243d38 100644
--- a/tests/test_build/test_sidebars_single.html
+++ b/tests/test_build/test_sidebars_single.html
@@ -1,45 +1,28 @@
 <nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
  <div class="bd-toc-item active">
   <!-- Specify a startdepth of 0 instead of default of 1 -->
-  <ul class="list-caption">
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Caption 1
-     </span>
-    </p>
-    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label class="label-parts" for="toctree-checkbox-1">
-      <i class="fas fa-chevron-down">
-      </i>
-     </label>
-     <ul class="nav bd-sidenav">
-      <li class="toctree-l1">
-       <a class="reference internal" href="section1/index.html">
-        Section 1 index
-       </a>
-      </li>
-     </ul>
-    </input>
+  <p aria-level="2" class="caption" role="heading">
+   <span class="caption-text">
+    Caption 1
+   </span>
+  </p>
+  <ul class="nav bd-sidenav">
+   <li class="toctree-l1">
+    <a class="reference internal" href="section1/index.html">
+     Section 1 index
+    </a>
    </li>
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Caption 2
-     </span>
-    </p>
-    <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
-    <label class="label-parts" for="toctree-checkbox-2">
-     <i class="fas fa-chevron-down">
-     </i>
-    </label>
-    <ul class="nav bd-sidenav">
-     <li class="toctree-l1">
-      <a class="reference internal" href="section2/index.html">
-       Section 2 index
-      </a>
-     </li>
-    </ul>
+  </ul>
+  <p aria-level="2" class="caption" role="heading">
+   <span class="caption-text">
+    Caption 2
+   </span>
+  </p>
+  <ul class="nav bd-sidenav">
+   <li class="toctree-l1">
+    <a class="reference internal" href="section2/index.html">
+     Section 2 index
+    </a>
    </li>
   </ul>
  </div>

From d67480e5d4db7f2da0da91b40f6934071e0206dd Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Fri, 25 Feb 2022 12:08:33 +1100
Subject: [PATCH 16/28] added test for sidebar nav_level0

---
 tests/test_build.py                           | 22 +++++++++
 .../test_sidebars_show_nav_level0_index.html  | 48 +++++++++++++++++++
 ...t_sidebars_show_nav_level0_subsection.html | 48 +++++++++++++++++++
 3 files changed, 118 insertions(+)
 create mode 100644 tests/test_build/test_sidebars_show_nav_level0_index.html
 create mode 100644 tests/test_build/test_sidebars_show_nav_level0_subsection.html

diff --git a/tests/test_build.py b/tests/test_build.py
index a7e88df12..b9258995d 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -281,6 +281,28 @@ def test_sidebars_level2(sphinx_build_factory, file_regression):
     file_regression.check(sidebar.prettify(), extension=".html")
 
 
+def test_sidebars_show_nav_level0_index(sphinx_build_factory, file_regression):
+    """"""
+    confoverrides = {"html_theme_options.show_nav_level": 0}
+    sphinx_build = sphinx_build_factory("sidebars", confoverrides=confoverrides).build()
+
+    # Both the column alignment and the margin should be changed
+    index_html = sphinx_build.html_tree("section1/index.html")
+    sidebar = index_html.select("nav#bd-docs-nav")[0]
+    file_regression.check(sidebar.prettify(), extension=".html")
+
+
+def test_sidebars_show_nav_level0_subsection(sphinx_build_factory, file_regression):
+    """"""
+    confoverrides = {"html_theme_options.show_nav_level": 0}
+    sphinx_build = sphinx_build_factory("sidebars", confoverrides=confoverrides).build()
+
+    # Both the column alignment and the margin should be changed
+    index_html = sphinx_build.html_tree("section1/subsection1/index.html")
+    sidebar = index_html.select("nav#bd-docs-nav")[0]
+    file_regression.check(sidebar.prettify(), extension=".html")
+
+
 def test_included_toc(sphinx_build_factory):
     """Test that Sphinx project containing TOC (.. toctree::) included
     via .. include:: can be successfully built.
diff --git a/tests/test_build/test_sidebars_show_nav_level0_index.html b/tests/test_build/test_sidebars_show_nav_level0_index.html
new file mode 100644
index 000000000..6051f3d99
--- /dev/null
+++ b/tests/test_build/test_sidebars_show_nav_level0_index.html
@@ -0,0 +1,48 @@
+<nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
+ <div class="bd-toc-item active">
+  <ul class="list-caption">
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Section 1
+     </span>
+    </p>
+    <input class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
+     <label class="label-parts" for="toctree-checkbox-1">
+      <i class="fas fa-chevron-down">
+      </i>
+     </label>
+     <ul class="nav bd-sidenav">
+      <li class="toctree-l1 has-children">
+       <a class="reference internal" href="subsection1/index.html">
+        Subsection 1.1 index
+       </a>
+       <input class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
+       <label for="toctree-checkbox-2">
+        <i class="fas fa-chevron-down">
+        </i>
+       </label>
+       <ul>
+        <li class="toctree-l2">
+         <a class="reference internal" href="subsection1/page1.html">
+          Section 1 sub 1 page 1
+         </a>
+        </li>
+        <li class="toctree-l2">
+         <a class="reference internal" href="subsection1/page2.html">
+          Section 1 sub 1 page 2
+         </a>
+        </li>
+       </ul>
+      </li>
+      <li class="toctree-l1">
+       <a class="reference internal" href="page2.html">
+        Section 1 page 1
+       </a>
+      </li>
+     </ul>
+    </input>
+   </li>
+  </ul>
+ </div>
+</nav>
diff --git a/tests/test_build/test_sidebars_show_nav_level0_subsection.html b/tests/test_build/test_sidebars_show_nav_level0_subsection.html
new file mode 100644
index 000000000..ef83eb97a
--- /dev/null
+++ b/tests/test_build/test_sidebars_show_nav_level0_subsection.html
@@ -0,0 +1,48 @@
+<nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
+ <div class="bd-toc-item active">
+  <ul class="list-caption">
+   <li class="toctree-l0 has-children">
+    <p aria-level="2" class="caption" role="heading">
+     <span class="caption-text">
+      Section 1
+     </span>
+    </p>
+    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
+     <label class="label-parts" for="toctree-checkbox-1">
+      <i class="fas fa-chevron-down">
+      </i>
+     </label>
+     <ul class="current nav bd-sidenav">
+      <li class="toctree-l1 current active has-children">
+       <a class="current reference internal" href="#">
+        Subsection 1.1 index
+       </a>
+       <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
+       <label for="toctree-checkbox-2">
+        <i class="fas fa-chevron-down">
+        </i>
+       </label>
+       <ul>
+        <li class="toctree-l2">
+         <a class="reference internal" href="page1.html">
+          Section 1 sub 1 page 1
+         </a>
+        </li>
+        <li class="toctree-l2">
+         <a class="reference internal" href="page2.html">
+          Section 1 sub 1 page 2
+         </a>
+        </li>
+       </ul>
+      </li>
+      <li class="toctree-l1">
+       <a class="reference internal" href="../page2.html">
+        Section 1 page 1
+       </a>
+      </li>
+     </ul>
+    </input>
+   </li>
+  </ul>
+ </div>
+</nav>

From 270fe931a7b9efdfda00c3642364872e6ae0b727 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Fri, 25 Feb 2022 12:27:17 +1100
Subject: [PATCH 17/28] docs edit

---
 docs/user_guide/configuring.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/user_guide/configuring.rst b/docs/user_guide/configuring.rst
index f8a73f0c8..5e54832a3 100644
--- a/docs/user_guide/configuring.rst
+++ b/docs/user_guide/configuring.rst
@@ -272,8 +272,8 @@ default, you can use the following configuration in ``conf.py``:
 This will make the first two navigations show up by default (AKA, top-level
 pages and their immediate children).
 
-If your pages are divided into parts, you can also hide the pages
-and make only the caption text of parts visible by using:
+If your pages are divided into parts, you can also hide all the pages by default
+and make only the part captions visible by using:
 
 .. code:: python
 
@@ -281,10 +281,12 @@ and make only the caption text of parts visible by using:
       "show_nav_level": 0
    }
 
+The part captions then become togglable using drop-boxes.
+
 .. note::
 
-   `"show_nav_level": 0` only works for parts and will behave the same as the
-   default value `1`, if the pages are not divided into parts.
+   ``"show_nav_level": 0`` only works when parts are present, and will behave the same as the
+   default value ``1``, if the pages are not divided into parts.
 
 .. _remove_toctrees:
 

From 4650f39636f3ecb04534b081669f0998c957c2ff Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Mon, 28 Feb 2022 11:03:07 +1100
Subject: [PATCH 18/28] parts chevron style

---
 src/pydata_sphinx_theme/assets/styles/index.scss | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pydata_sphinx_theme/assets/styles/index.scss b/src/pydata_sphinx_theme/assets/styles/index.scss
index 76f02e94a..00deae819 100644
--- a/src/pydata_sphinx_theme/assets/styles/index.scss
+++ b/src/pydata_sphinx_theme/assets/styles/index.scss
@@ -564,13 +564,15 @@ nav.bd-links {
   }
   .label-parts {
     width: 100%;
-    justify-content: right;
-    top: -0.25em; // aligning chevron with text
+    height: 100%;
     &:hover {
       background: none;
     }
     i {
       width: 30px;
+      position: absolute;
+      top: 0.3em; // aligning chevron with text
+      right: 0em; // aligning chevron to the right
     }
   }
 }

From 99b23406ac07000350c726bf40bd0577ae68921f Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Feb 2022 11:03:51 +1100
Subject: [PATCH 19/28] Update docs/user_guide/configuring.rst

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 docs/user_guide/configuring.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/user_guide/configuring.rst b/docs/user_guide/configuring.rst
index 5e54832a3..205d91a2e 100644
--- a/docs/user_guide/configuring.rst
+++ b/docs/user_guide/configuring.rst
@@ -272,6 +272,9 @@ default, you can use the following configuration in ``conf.py``:
 This will make the first two navigations show up by default (AKA, top-level
 pages and their immediate children).
 
+Collapse parts / captions
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
 If your pages are divided into parts, you can also hide all the pages by default
 and make only the part captions visible by using:
 

From dca2f5dd6f5838bf1837754f4e6ec4a3b72b18c9 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Feb 2022 11:05:26 +1100
Subject: [PATCH 20/28] Update src/pydata_sphinx_theme/__init__.py

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/pydata_sphinx_theme/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index d1ac3ee5a..de6855c9c 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -133,7 +133,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
 
             # Add collapse boxes for parts/captions.
             # show_nav_level: 0 means make parts collapsible.
-            if not show_nav_level:
+            if show_nav_level == 0:
                 partcaptions = soup.find_all("p", attrs={"class": "caption"})
                 if len(partcaptions):
                     new_soup = bs("<ul class='list-caption'></ul>", "html.parser")

From c5ef7d198e4bda9fcd96b49674f65c8a4d895f07 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Feb 2022 11:05:49 +1100
Subject: [PATCH 21/28] Update src/pydata_sphinx_theme/__init__.py

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/pydata_sphinx_theme/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index de6855c9c..0aad230b3 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -132,6 +132,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                 ul.attrs["class"] = ul.attrs.get("class", []) + ["nav", "bd-sidenav"]
 
             # Add collapse boxes for parts/captions.
+            # Wraps the TOC part in an extra <ul> to behave like chapters with toggles
             # show_nav_level: 0 means make parts collapsible.
             if show_nav_level == 0:
                 partcaptions = soup.find_all("p", attrs={"class": "caption"})

From 8e94fafd8482443e92be624cb651aef9c1a1342e Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Feb 2022 11:06:36 +1100
Subject: [PATCH 22/28] Update src/pydata_sphinx_theme/__init__.py

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/pydata_sphinx_theme/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 0aad230b3..53649dc3f 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -144,8 +144,7 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                                 toclist = sibling
                                 break
                         li = soup.new_tag("li", attrs={"class": "toctree-l0"})
-                        li.append(caption)
-                        li.append(toclist)
+                        li.extend([caption, toclist])
                         new_soup.ul.append(li)
                 else:
                     new_soup = soup

From a60b2a7cd6a216d614374bda830429839fb7cf31 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Feb 2022 11:07:38 +1100
Subject: [PATCH 23/28] Update src/pydata_sphinx_theme/__init__.py

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/pydata_sphinx_theme/__init__.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 53649dc3f..3ae58ec40 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -139,10 +139,8 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                 if len(partcaptions):
                     new_soup = bs("<ul class='list-caption'></ul>", "html.parser")
                     for caption in partcaptions:
-                        for sibling in caption.next_siblings:
-                            if sibling.name == "ul":
-                                toclist = sibling
-                                break
+                        # Assume that the next <ul> element is the TOC list for this part
+                        toclist = caption.select("~ ul")
                         li = soup.new_tag("li", attrs={"class": "toctree-l0"})
                         li.extend([caption, toclist])
                         new_soup.ul.append(li)

From 819caedef537bed0ac186c9fa99c22edefabb77a Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Feb 2022 11:09:37 +1100
Subject: [PATCH 24/28] Update src/pydata_sphinx_theme/__init__.py

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/pydata_sphinx_theme/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 3ae58ec40..7488dba5c 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -286,8 +286,7 @@ def _add_collapse_checkboxes(soup):
         if "current" in classes:
             parentli = element.find_parent("li", class_="toctree-l0")
             if parentli:
-                caption = parentli.find("p", class_="caption")
-                caption.find_next_sibling("input").attrs["checked"] = ""
+                caption = parentli.select("p.caption ~ input").attrs["checked"] = ""
 
         # Nothing more to do, unless this has "children"
         if not element.find("ul"):

From 2b43a8c40b6c224cd1b6fa26b85779be172da4f5 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashgfude@gmail.com>
Date: Mon, 28 Feb 2022 12:27:44 +1100
Subject: [PATCH 25/28] tests and some code refactoring

---
 src/pydata_sphinx_theme/__init__.py           | 23 ++++-----
 tests/test_build.py                           | 42 +++++++++++-----
 .../test_sidebars_show_nav_level0_index.html  | 48 -------------------
 ...t_sidebars_show_nav_level0_subsection.html | 48 -------------------
 4 files changed, 42 insertions(+), 119 deletions(-)
 delete mode 100644 tests/test_build/test_sidebars_show_nav_level0_index.html
 delete mode 100644 tests/test_build/test_sidebars_show_nav_level0_subsection.html

diff --git a/src/pydata_sphinx_theme/__init__.py b/src/pydata_sphinx_theme/__init__.py
index 7488dba5c..32018a7d5 100644
--- a/src/pydata_sphinx_theme/__init__.py
+++ b/src/pydata_sphinx_theme/__init__.py
@@ -139,29 +139,30 @@ def generate_nav_html(kind, startdepth=None, show_nav_level=1, **kwargs):
                 if len(partcaptions):
                     new_soup = bs("<ul class='list-caption'></ul>", "html.parser")
                     for caption in partcaptions:
-                        # Assume that the next <ul> element is the TOC list for this part
-                        toclist = caption.select("~ ul")
+                        # Assume that the next <ul> element is the TOC list
+                        # for this part
+                        for sibling in caption.next_siblings:
+                            if sibling.name == "ul":
+                                toclist = sibling
+                                break
                         li = soup.new_tag("li", attrs={"class": "toctree-l0"})
                         li.extend([caption, toclist])
                         new_soup.ul.append(li)
-                else:
-                    new_soup = soup
-            else:
-                new_soup = soup
+                    soup = new_soup
 
             # Add icons and labels for collapsible nested sections
-            _add_collapse_checkboxes(new_soup)
+            _add_collapse_checkboxes(soup)
 
             # Open the navbar to the proper depth
             for ii in range(int(show_nav_level)):
-                for checkbox in new_soup.select(
+                for checkbox in soup.select(
                     f"li.toctree-l{ii} > input.toctree-checkbox"
                 ):
                     checkbox.attrs["checked"] = None
-            out = new_soup.prettify()
+            out = soup.prettify()
 
         elif kind == "raw":
-            out = new_soup
+            out = soup
 
         return out
 
@@ -286,7 +287,7 @@ def _add_collapse_checkboxes(soup):
         if "current" in classes:
             parentli = element.find_parent("li", class_="toctree-l0")
             if parentli:
-                caption = parentli.select("p.caption ~ input").attrs["checked"] = ""
+                parentli.select("p.caption ~ input")[0].attrs["checked"] = ""
 
         # Nothing more to do, unless this has "children"
         if not element.find("ul"):
diff --git a/tests/test_build.py b/tests/test_build.py
index b9258995d..c5f1ac815 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -281,26 +281,44 @@ def test_sidebars_level2(sphinx_build_factory, file_regression):
     file_regression.check(sidebar.prettify(), extension=".html")
 
 
-def test_sidebars_show_nav_level0_index(sphinx_build_factory, file_regression):
-    """"""
+def test_sidebars_show_nav_level0(sphinx_build_factory, file_regression):
+    """
+    Regression test for show_nav_level:0 when the toc is divided into parts.
+    Testing both home page and a subsection page for correct elements.
+    """
     confoverrides = {"html_theme_options.show_nav_level": 0}
     sphinx_build = sphinx_build_factory("sidebars", confoverrides=confoverrides).build()
 
-    # Both the column alignment and the margin should be changed
+    # 1. Home Page
     index_html = sphinx_build.html_tree("section1/index.html")
     sidebar = index_html.select("nav#bd-docs-nav")[0]
-    file_regression.check(sidebar.prettify(), extension=".html")
 
+    # check if top-level ul is present
+    ul = sidebar.find("ul")
+    assert "list-caption" in ul.attrs["class"]
 
-def test_sidebars_show_nav_level0_subsection(sphinx_build_factory, file_regression):
-    """"""
-    confoverrides = {"html_theme_options.show_nav_level": 0}
-    sphinx_build = sphinx_build_factory("sidebars", confoverrides=confoverrides).build()
+    # get all li elements
+    li = ul.select("li")
 
-    # Both the column alignment and the margin should be changed
-    index_html = sphinx_build.html_tree("section1/subsection1/index.html")
-    sidebar = index_html.select("nav#bd-docs-nav")[0]
-    file_regression.check(sidebar.prettify(), extension=".html")
+    # part li
+    assert "toctree-l0 has-children" in " ".join(li[0].attrs["class"])
+    assert "caption-text" in li[0].select("p span")[0].attrs["class"]
+    assert "label-parts" in li[0].find("label").attrs["class"]
+
+    # basic checks on other levels
+    assert "toctree-l1 has-children" in " ".join(li[1].attrs["class"])
+    assert "toctree-l2" in li[2].attrs["class"]
+
+    # 2. Subsection Page
+    subsection_html = sphinx_build.html_tree("section1/subsection1/index.html")
+    sidebar = subsection_html.select("nav#bd-docs-nav")[0]
+
+    # get all input elements
+    input_elem = sidebar.select("input")
+
+    # all input elements should be collapsed in this page
+    for ii in input_elem:
+        assert "checked" in ii.attrs
 
 
 def test_included_toc(sphinx_build_factory):
diff --git a/tests/test_build/test_sidebars_show_nav_level0_index.html b/tests/test_build/test_sidebars_show_nav_level0_index.html
deleted file mode 100644
index 6051f3d99..000000000
--- a/tests/test_build/test_sidebars_show_nav_level0_index.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
- <div class="bd-toc-item active">
-  <ul class="list-caption">
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Section 1
-     </span>
-    </p>
-    <input class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label class="label-parts" for="toctree-checkbox-1">
-      <i class="fas fa-chevron-down">
-      </i>
-     </label>
-     <ul class="nav bd-sidenav">
-      <li class="toctree-l1 has-children">
-       <a class="reference internal" href="subsection1/index.html">
-        Subsection 1.1 index
-       </a>
-       <input class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
-       <label for="toctree-checkbox-2">
-        <i class="fas fa-chevron-down">
-        </i>
-       </label>
-       <ul>
-        <li class="toctree-l2">
-         <a class="reference internal" href="subsection1/page1.html">
-          Section 1 sub 1 page 1
-         </a>
-        </li>
-        <li class="toctree-l2">
-         <a class="reference internal" href="subsection1/page2.html">
-          Section 1 sub 1 page 2
-         </a>
-        </li>
-       </ul>
-      </li>
-      <li class="toctree-l1">
-       <a class="reference internal" href="page2.html">
-        Section 1 page 1
-       </a>
-      </li>
-     </ul>
-    </input>
-   </li>
-  </ul>
- </div>
-</nav>
diff --git a/tests/test_build/test_sidebars_show_nav_level0_subsection.html b/tests/test_build/test_sidebars_show_nav_level0_subsection.html
deleted file mode 100644
index ef83eb97a..000000000
--- a/tests/test_build/test_sidebars_show_nav_level0_subsection.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<nav aria-label="Main navigation" class="bd-links" id="bd-docs-nav">
- <div class="bd-toc-item active">
-  <ul class="list-caption">
-   <li class="toctree-l0 has-children">
-    <p aria-level="2" class="caption" role="heading">
-     <span class="caption-text">
-      Section 1
-     </span>
-    </p>
-    <input checked="" class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
-     <label class="label-parts" for="toctree-checkbox-1">
-      <i class="fas fa-chevron-down">
-      </i>
-     </label>
-     <ul class="current nav bd-sidenav">
-      <li class="toctree-l1 current active has-children">
-       <a class="current reference internal" href="#">
-        Subsection 1.1 index
-       </a>
-       <input checked="" class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox"/>
-       <label for="toctree-checkbox-2">
-        <i class="fas fa-chevron-down">
-        </i>
-       </label>
-       <ul>
-        <li class="toctree-l2">
-         <a class="reference internal" href="page1.html">
-          Section 1 sub 1 page 1
-         </a>
-        </li>
-        <li class="toctree-l2">
-         <a class="reference internal" href="page2.html">
-          Section 1 sub 1 page 2
-         </a>
-        </li>
-       </ul>
-      </li>
-      <li class="toctree-l1">
-       <a class="reference internal" href="../page2.html">
-        Section 1 page 1
-       </a>
-      </li>
-     </ul>
-    </input>
-   </li>
-  </ul>
- </div>
-</nav>

From df2ca976d8eae2a6278975a0e2257c7963f8dbd1 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@gmail.com>
Date: Wed, 9 Mar 2022 20:12:16 -0800
Subject: [PATCH 26/28] Clarify this in the docs

---
 docs/user_guide/configuring.rst | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/docs/user_guide/configuring.rst b/docs/user_guide/configuring.rst
index 205d91a2e..421d3533a 100644
--- a/docs/user_guide/configuring.rst
+++ b/docs/user_guide/configuring.rst
@@ -272,11 +272,14 @@ default, you can use the following configuration in ``conf.py``:
 This will make the first two navigations show up by default (AKA, top-level
 pages and their immediate children).
 
-Collapse parts / captions
-~~~~~~~~~~~~~~~~~~~~~~~~~
+Collapse toctree captions / parts
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If your pages are divided into parts, you can also hide all the pages by default
-and make only the part captions visible by using:
+If your ``toctree`` elements have captions assigned to them (with ``:caption:``), you may
+collapse navigation items so that only the caption is visible. Clicking on the
+caption will display the items below.
+
+To enable this behavior, set the ``show_nav_level`` value to 0, like below:
 
 .. code:: python
 
@@ -284,12 +287,14 @@ and make only the part captions visible by using:
       "show_nav_level": 0
    }
 
-The part captions then become togglable using drop-boxes.
 
-.. note::
 
-   ``"show_nav_level": 0`` only works when parts are present, and will behave the same as the
-   default value ``1``, if the pages are not divided into parts.
+.. note::
+   
+   You can only collapse your ``toctree`` items underneath their caption if a caption is defined for them!
+   If your ``toctree`` does not have a caption defined, then all of the pages underneath it will be displayed
+   (the same as the default theme behavior). See `the toctree documentation <https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-toctree>`_
+   for more details.
 
 .. _remove_toctrees:
 

From 7da634d914d6aa7434226ab0ce284ec43f49afd0 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@gmail.com>
Date: Wed, 9 Mar 2022 20:15:31 -0800
Subject: [PATCH 27/28] Update docs/user_guide/configuring.rst

---
 docs/user_guide/configuring.rst | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/docs/user_guide/configuring.rst b/docs/user_guide/configuring.rst
index 421d3533a..257771099 100644
--- a/docs/user_guide/configuring.rst
+++ b/docs/user_guide/configuring.rst
@@ -289,12 +289,16 @@ To enable this behavior, set the ``show_nav_level`` value to 0, like below:
 
 
 
+  
+You can only collapse your ``toctree`` items underneath their caption if a caption is defined for them!
+If your ``toctree`` does not have a caption defined, then all of the pages underneath it will be displayed
+(the same as the default theme behavior). See `the toctree documentation <https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-toctree>`_
+for more details.
+
 .. note::
-   
-   You can only collapse your ``toctree`` items underneath their caption if a caption is defined for them!
-   If your ``toctree`` does not have a caption defined, then all of the pages underneath it will be displayed
-   (the same as the default theme behavior). See `the toctree documentation <https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-toctree>`_
-   for more details.
+
+   In some Sphinx sites, the top-level ``toctree`` groupings make up "parts" in the documentation, with
+   each page beneath making up a "chapter".
 
 .. _remove_toctrees:
 

From a3d4cafffdb60cd9978eb7cfc5018d9d45cc4806 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 9 Mar 2022 20:20:40 -0800
Subject: [PATCH 28/28] Cleaning up docs

---
 docs/user_guide/configuring.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/user_guide/configuring.rst b/docs/user_guide/configuring.rst
index 257771099..af1eb6add 100644
--- a/docs/user_guide/configuring.rst
+++ b/docs/user_guide/configuring.rst
@@ -245,8 +245,8 @@ override this behavior and control the sidebar on a per-page basis, use the
 
 .. _navigation-depth:
 
-Navigation depth and collapsing of the sidebar
-==============================================
+Navigation depth and collapsing the sidebar
+===========================================
 
 By default, this theme enables to expand/collapse subsections in the left
 sidebar navigation (without actually navigating to the page itself), and this extends
@@ -272,8 +272,8 @@ default, you can use the following configuration in ``conf.py``:
 This will make the first two navigations show up by default (AKA, top-level
 pages and their immediate children).
 
-Collapse toctree captions / parts
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Collapse entire toctree captions / parts
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 If your ``toctree`` elements have captions assigned to them (with ``:caption:``), you may
 collapse navigation items so that only the caption is visible. Clicking on the
@@ -289,7 +289,7 @@ To enable this behavior, set the ``show_nav_level`` value to 0, like below:
 
 
 
-  
+
 You can only collapse your ``toctree`` items underneath their caption if a caption is defined for them!
 If your ``toctree`` does not have a caption defined, then all of the pages underneath it will be displayed
 (the same as the default theme behavior). See `the toctree documentation <https://www.sphinx-doc.org/en/master/usage/restructuredtext/directives.html#directive-toctree>`_