From 5ce5ad8ce71a9481b2b4f03a596d6cf335ad73ca Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Mon, 7 Nov 2022 11:22:05 +0100
Subject: [PATCH 01/65] Removing cruft for pydata theme

---
 docs/customize/footer-content.md              |  26 ++++
 docs/customize/index.md                       |   1 +
 src/sphinx_book_theme/__init__.py             |  24 ++++
 src/sphinx_book_theme/assets/scripts/index.js |  39 ------
 .../assets/styles/abstracts/_variables.scss   |  43 ++----
 .../assets/styles/base/_base.scss             |   5 -
 .../assets/styles/base/_bootstrap.scss        |   9 --
 .../assets/styles/base/_typography.scss       |  48 +------
 .../assets/styles/components/_buttons.scss    |  43 ++----
 .../assets/styles/components/_search.scss     |  18 ---
 .../assets/styles/content/_code.scss          |  47 -------
 .../assets/styles/content/_field-lists.scss   |  10 --
 .../assets/styles/content/_footnotes.scss     |  18 ---
 .../assets/styles/content/_glossary.scss      |   5 -
 .../assets/styles/content/_math.scss          |  43 ------
 .../assets/styles/content/_quotes.scss        |  13 +-
 .../assets/styles/content/_sidebar.scss       |  24 ----
 .../styles/content/_tableofcontents.scss      |  49 -------
 .../assets/styles/extensions/_ablog.scss      |  41 ------
 .../{comments.scss => _comments.scss}         |   0
 .../assets/styles/extensions/_myst-nb.scss    |  41 ------
 .../styles/extensions/_readthedocs.scss       |  64 ---------
 .../styles/extensions/_sphinx-tabs.scss       |  12 --
 .../assets/styles/index.scss                  |  25 +---
 .../assets/styles/pages/_search.scss          |  57 --------
 .../assets/styles/sections/_announcement.scss |   4 -
 .../styles/sections/_article-container.scss   |   8 ++
 .../assets/styles/sections/_article.scss      |  22 ---
 .../styles/sections/_footer-article.scss      |  17 ---
 .../styles/sections/_footer-content.scss      |  12 --
 .../styles/sections/_header-article.scss      |  10 +-
 .../styles/sections/_header-primary.scss      |   3 +
 .../assets/styles/sections/_headers.scss      |  22 ---
 .../styles/sections/_sidebar-primary.scss     | 125 +++--------------
 .../styles/sections/_sidebar-secondary.scss   | 132 +-----------------
 .../styles/sections/_sidebars-toggle.scss     |  77 ----------
 .../sphinx_book_theme/components/author.html  |   5 +
 .../components/extra-footer.html              |   5 +
 .../sidebar-icons.html}                       |   0
 .../components/toc-button.html                |   4 -
 .../theme/sphinx_book_theme/layout.html       |  18 +--
 .../sections/footer-content.html              |  29 ++--
 .../sections/sidebar-primary.html             |  24 ----
 .../sections/sidebar-secondary.html           |  16 ---
 .../sphinx_book_theme/sections/sidebar.html   |   0
 .../theme/sphinx_book_theme/theme.conf        |  12 +-
 46 files changed, 148 insertions(+), 1102 deletions(-)
 create mode 100644 docs/customize/footer-content.md
 delete mode 100644 src/sphinx_book_theme/assets/styles/base/_bootstrap.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/components/_search.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_code.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_field-lists.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_footnotes.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_glossary.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_math.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_sidebar.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/content/_tableofcontents.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/extensions/_ablog.scss
 rename src/sphinx_book_theme/assets/styles/extensions/{comments.scss => _comments.scss} (100%)
 delete mode 100644 src/sphinx_book_theme/assets/styles/extensions/_myst-nb.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/extensions/_readthedocs.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/extensions/_sphinx-tabs.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/pages/_search.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/sections/_announcement.scss
 create mode 100644 src/sphinx_book_theme/assets/styles/sections/_article-container.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/sections/_article.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/sections/_footer-article.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
 create mode 100644 src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/sections/_headers.scss
 delete mode 100644 src/sphinx_book_theme/assets/styles/sections/_sidebars-toggle.scss
 create mode 100644 src/sphinx_book_theme/theme/sphinx_book_theme/components/author.html
 create mode 100644 src/sphinx_book_theme/theme/sphinx_book_theme/components/extra-footer.html
 rename src/sphinx_book_theme/theme/sphinx_book_theme/{sections/header.html => components/sidebar-icons.html} (100%)
 delete mode 100644 src/sphinx_book_theme/theme/sphinx_book_theme/components/toc-button.html
 delete mode 100644 src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-primary.html
 delete mode 100644 src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-secondary.html
 delete mode 100644 src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar.html

diff --git a/docs/customize/footer-content.md b/docs/customize/footer-content.md
new file mode 100644
index 00000000..7e67d092
--- /dev/null
+++ b/docs/customize/footer-content.md
@@ -0,0 +1,26 @@
+# Customize the content footer
+
+There is a content footer that spans the wisth of the page, and is visibile when you scroll to the bottom of the content.
+
+By default, the content footer has the following items:
+
+- `author.html`: Display the author of the page, if present.
+- `copyright.html`: Display copyright information about the website.
+- `last-updated.html`: Display the latest date that the website was updated.
+- `extra-footer.html`: A placeholder for arbitrary HTML you may add (see [](content-footer:extra-footer)).
+
+(content-footer:extra-footer)=
+## Add extra HTML to your content footer
+
+You may add custom HTML to the content footer via `conf.py`.
+This is a shortcut in case you wish to avoid defining your own HTML template.
+
+To do so, use the `extra_footer` configuration and provide any HTML that you wish.
+For example:
+
+```python
+html_theme_options = {
+    ...
+    "extra_footer": "<div>hi there!</div>",
+}
+```
diff --git a/docs/customize/index.md b/docs/customize/index.md
index d3c0f58a..74771041 100644
--- a/docs/customize/index.md
+++ b/docs/customize/index.md
@@ -66,6 +66,7 @@ The following sections describe a few ways to customize the theme in more depth.
 ```{toctree}
 sidebar-primary.md
 sidebar-secondary.md
+footer-content.md
 announcements.md
 header.md
 download.md
diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index 1e627e64..6c327c81 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -180,6 +180,29 @@ def update_general_config(app, config):
     config.templates_path.append(os.path.join(theme_dir, "components"))
 
 
+
+def update_templates(app, pagename, templatename, context, doctree):
+    """Update template names and assets for page build.
+    
+    This is a copy of what the pydata theme does here to include a new section
+    - https://github.com/pydata/pydata-sphinx-theme/blob/0a4894fab49befc59eb497811949a1d0ede626eb/src/pydata_sphinx_theme/__init__.py#L173
+    """
+    # Allow for more flexibility in template names
+    template_sections = ["theme_footer_content_items"]
+    for section in template_sections:
+        if context.get(section):
+            # Break apart `,` separated strings so we can use , in the defaults
+            if isinstance(context.get(section), str):
+                context[section] = [
+                    ii.strip() for ii in context.get(section).split(",")
+                ]
+
+            # Add `.html` to templates with no suffix
+            for ii, template in enumerate(context.get(section)):
+                if not os.path.splitext(template)[1]:
+                    context[section][ii] = template + ".html"
+
+
 def setup(app: Sphinx):
     # Register theme
     theme_dir = get_html_theme_path()
@@ -195,6 +218,7 @@ def setup(app: Sphinx):
     app.connect("config-inited", update_general_config)
     app.connect("html-page-context", add_metadata_to_page)
     app.connect("html-page-context", hash_html_assets)
+    app.connect("html-page-context", update_templates)
 
     # Nodes
     SideNoteNode.add_node(app)
diff --git a/src/sphinx_book_theme/assets/scripts/index.js b/src/sphinx_book_theme/assets/scripts/index.js
index eadafd0a..f1763676 100644
--- a/src/sphinx_book_theme/assets/scripts/index.js
+++ b/src/sphinx_book_theme/assets/scripts/index.js
@@ -159,43 +159,6 @@ var initThebeSBT = () => {
   initThebe();
 };
 
-/**
- * Use Bootstrap helper function to enable tooltips.
- */
-var initTooltips = () => {
-  $(document).ready(function () {
-    $('[data-toggle="tooltip"]').tooltip({
-      trigger: "hover",
-      delay: { show: 500, hide: 100 },
-    });
-  });
-};
-
-/**
- * MutationObserver to move the ReadTheDocs button
- */
-function initRTDObserver() {
-  const mutatedCallback = (mutationList, observer) => {
-    mutationList.forEach((mutation) => {
-      // Check whether the mutation is for RTD, which will have a specific structure
-      if (mutation.addedNodes.length === 0) {
-        return;
-      }
-      if (mutation.addedNodes[0].data === undefined) {
-        return;
-      }
-      if (mutation.addedNodes[0].data.search("Inserted RTD Footer") != -1) {
-        mutation.addedNodes.forEach((node) => {
-          document.getElementById("rtd-footer-container").append(node);
-        });
-      }
-    });
-  };
-
-  const observer = new MutationObserver(mutatedCallback);
-  const config = { childList: true };
-  observer.observe(document.body, config);
-}
 
 /**
  * Add no print class to certain DOM elements
@@ -228,8 +191,6 @@ window.toggleFullScreen = toggleFullScreen;
 /**
  * Set up functions to load when the DOM is ready
  */
-sbRunWhenDOMLoaded(initTooltips);
 sbRunWhenDOMLoaded(initTocHide);
-sbRunWhenDOMLoaded(initRTDObserver);
 sbRunWhenDOMLoaded(addNoPrint);
 sbRunWhenDOMLoaded(setMode);
diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
index b046618b..c70e7b7c 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
@@ -7,12 +7,6 @@ $breakpoint-lg: 992px;
 $breakpoint-md: 768px;
 $breakpoint-sm: 576px;
 
-// Colors
-$grey--dark: #5a5a5a;
-$grey--medium: #aaa;
-$grey--light: #ccc;
-$non-content-grey: $grey--dark;
-
 // Z-index stacking (from Bootstrap)
 // ref: https://getbootstrap.com/docs/5.0/layout/z-index/
 $zindex-sticky: 1020;
@@ -31,34 +25,21 @@ $box-border-radius: 0.4em;
 
 $animation-time: 0.25s;
 
-$border-thin: 1px solid rgba(0, 0, 0, 0.1);
-
-// Overrides for pydata sphinx theme.
-// See https://github.com/pydata/pydata-sphinx-theme/blob/master/pydata_sphinx_theme/static/css/theme.css
-:root[data-theme="light"] {
+/**
+ * Variables that aren't impacted by light/dark
+ */
+html {
   // Over-ride the pydata theme so that readers can use their system base
   --pst-font-size-base: none;
+  --pst-header-height: 0px;
+}
 
+// Overrides for pydata sphinx theme.
+// See https://github.com/pydata/pydata-sphinx-theme/blob/master/pydata_sphinx_theme/static/css/theme.css
+html[data-theme="light"] {
   --pst-color-primary: rgb(87, 154, 202);
-  --pst-color-link: rgb(0, 113, 188);
-  --pst-color-border: rgb(238, 238, 238);
-
-  // Font sizes
-  --sbt-font-size-regular: 100%;
-  --sbt-font-size-large: 112.5%;
-  --sbt-font-size-small-1: 87.5%;
-  --sbt-font-size-small-2: 70%;
-
-  // Variables for this theme
-  --sbt-sidebar-font-size: var(--sbt-font-size-small-1);
-  --sbt-header-article-font-size: var(--sbt-font-size-small-1);
-  --sbt-prevnext-font-size: var(--sbt-font-size-small-1);
-  --sbt-footer-font-size: var(--sbt-font-size-small-1);
-
-  // Search variables
-  --sbt-color-search-highlighted: rgb(243, 119, 38);
-  --sbt-color-search-icon: rgb(164, 166, 167);
+}
 
-  // Announcement
-  --sbt-color-announcement: rgb(97, 97, 97);
+html[data-theme="dark"] {
+  --pst-color-primary: rgb(87, 154, 202);
 }
diff --git a/src/sphinx_book_theme/assets/styles/base/_base.scss b/src/sphinx_book_theme/assets/styles/base/_base.scss
index b80896e6..75653d23 100644
--- a/src/sphinx_book_theme/assets/styles/base/_base.scss
+++ b/src/sphinx_book_theme/assets/styles/base/_base.scss
@@ -28,11 +28,6 @@
   display: none;
 }
 
-// default color for all the links
-a {
-  color: var(--pst-color-link);
-}
-
 // Print-specific utility classes
 .onlyprint {
   display: none;
diff --git a/src/sphinx_book_theme/assets/styles/base/_bootstrap.scss b/src/sphinx_book_theme/assets/styles/base/_bootstrap.scss
deleted file mode 100644
index 5d79176e..00000000
--- a/src/sphinx_book_theme/assets/styles/base/_bootstrap.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
-* Bootstrap-specific hacks
-*/
-
-// Prevent columns w/ wide content from breaking the grid
-// ref: https://github.com/twbs/bootstrap/pull/30049/files
-.col {
-  min-width: 0;
-}
diff --git a/src/sphinx_book_theme/assets/styles/base/_typography.scss b/src/sphinx_book_theme/assets/styles/base/_typography.scss
index 41b0bf0f..93a29f8a 100644
--- a/src/sphinx_book_theme/assets/styles/base/_typography.scss
+++ b/src/sphinx_book_theme/assets/styles/base/_typography.scss
@@ -3,57 +3,11 @@
 *********************************************/
 
 .bd-article-container {
-  // Content links and link color
-  a.headerlink {
-    opacity: 0;
-    margin-left: 0.2em;
-
-    &:hover {
-      background-color: transparent;
-      color: var(--pst-color-link);
-      opacity: 1 !important;
-    }
-  }
-
-  a,
-  a.nav-link, // to be more specific, so that pst style doesn't override
-  a:visited {
-    color: var(--pst-color-link);
-  }
-
   h1,
   h2,
   h3,
   h4,
   h5 {
-    color: black;
-    &:hover a.headerlink {
-      opacity: 0.5;
-    }
-    // Make sure titles don't become hyperlink color when there are labels
-    a.toc-backref {
-      color: inherit;
-    }
-  }
-
-  // Over-rides the pydata theme's large margins
-  h3,
-  h4,
-  h5,
-  h6 {
-    margin-top: 1em;
-  }
-
-  // Lists
-  ul,
-  ol {
-    p {
-      margin-bottom: 0;
-    }
-  }
-
-  // Misc text and directives
-  p.centered {
-    text-align: center;
+    color: var(--pst-color-text-muted);
   }
 }
diff --git a/src/sphinx_book_theme/assets/styles/components/_buttons.scss b/src/sphinx_book_theme/assets/styles/components/_buttons.scss
index ab7acdb6..d6620e01 100644
--- a/src/sphinx_book_theme/assets/styles/components/_buttons.scss
+++ b/src/sphinx_book_theme/assets/styles/components/_buttons.scss
@@ -9,9 +9,15 @@
   align-items: center;
   justify-content: center;
 
-  background-color: white;
-  color: $non-content-grey;
+  // Color should be more muted than pydata theme
+  color: var(--pst-color-text-muted);
+  &:hover {
+    color: var(--pst-color-text-base);
+    text-decoration: none;
+  }
+  background-color: var(--pst-color-background);
   cursor: pointer;
+
   border: none;
   padding: 0.1rem 0.5rem; // Horizontal padding since labels have none
   margin: 0 0.1rem;
@@ -55,7 +61,7 @@
   padding: 0.5em;
 
   // Style
-  background-color: white;
+  background-color: var(--pst-color-background);
 
   .headerbtn {
     justify-content: left;
@@ -86,34 +92,3 @@
     font-size: 1.2em; // Slightly smaller icons in a dropdown
   }
 }
-
-// HACK: Need this to be extra-selective to over-ride some too-specific PST CSS
-div.header-article-main {
-  .header-article__left,
-  .header-article__right {
-    a,
-    button,
-    label {
-      color: $non-content-grey;
-
-      // Over-ride bootstrap defaults for clicking
-      &:hover,
-      &:focus {
-        color: black;
-        box-shadow: none;
-        text-decoration: none;
-      }
-    }
-  }
-}
-
-/**
- * In-page table of contents
- */
-.headerbtn-secondary {
-  // Hide the button on wide screens since we display the TOC.
-  display: block;
-  @media (min-width: $breakpoint-md) {
-    display: none;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/components/_search.scss b/src/sphinx_book_theme/assets/styles/components/_search.scss
deleted file mode 100644
index 2ecf07aa..00000000
--- a/src/sphinx_book_theme/assets/styles/components/_search.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-/*********************************************
-* Search bar and text styling from searches *
-*********************************************/
-
-// Highlighted search items are a slightly lighter version of Jupyter orange
-dt:target,
-span.highlighted {
-  background-color: var(--sbt-color-search-highlighted);
-}
-
-.bd-search {
-  .icon {
-    color: var(--sbt-color-search-icon);
-  }
-  .search-button__kbd-shortcut {
-    display: none;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_code.scss b/src/sphinx_book_theme/assets/styles/content/_code.scss
deleted file mode 100644
index d0484b9d..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_code.scss
+++ /dev/null
@@ -1,47 +0,0 @@
-/*********************************************
-* Code and pre styling *
-*********************************************/
-
-code {
-  font-size: 87.5% !important;
-}
-
-pre {
-  border-radius: $box-border-radius;
-  @include scrollbar-style();
-}
-
-// Over-ride Sphinx default so that content fills whitespace w/ margin content
-pre,
-div[class*="highlight-"] {
-  clear: none;
-}
-
-.highlighttable {
-  .linenos {
-    vertical-align: baseline;
-  }
-}
-
-// Code blocks should have a margin, but code *cells* get margin from a parent
-div.highlight {
-  background: none;
-  margin-bottom: 1em;
-}
-
-// CodeMirror styles for live thebe cells.
-.cm-s-default {
-  font-family: var(--jp-code-font-family);
-  font-size: var(--jp-code-font-size);
-  line-height: var(--jp-code-line-height);
-}
-
-.CodeMirror-focused {
-  background-color: var(--jp-cell-editor-active-background) !important;
-  border: var(--jp-border-width) solid var(--jp-cell-editor-active-border-color);
-  margin: -1px;
-}
-
-div.literal-block-wrapper {
-  border: none;
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_field-lists.scss b/src/sphinx_book_theme/assets/styles/content/_field-lists.scss
deleted file mode 100644
index 88a9637c..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_field-lists.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// Field lists
-// See: https://docutils.sourceforge.io/docs/user/rst/quickref.html#definition-lists
-// TODO the field list should be a different format,
-// but be wary of issues like https://github.com/pandas-dev/pydata-sphinx-theme/issues/193
-dl.simple,
-dl.field-list {
-  & dd {
-    margin-left: 1.5em;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_footnotes.scss b/src/sphinx_book_theme/assets/styles/content/_footnotes.scss
deleted file mode 100644
index 196572e2..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_footnotes.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-dl.footnote {
-  span.fn-backref {
-    font-size: 1em;
-    padding-left: 0.1em;
-  }
-
-  // To ensure that the footnote text is aligned across lines
-  dd {
-    font-size: 0.9em;
-    margin-left: 3em;
-  }
-}
-
-// Footnotes and Citations
-.footnote-reference,
-a.bibtex.internal {
-  font-size: 1em;
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_glossary.scss b/src/sphinx_book_theme/assets/styles/content/_glossary.scss
deleted file mode 100644
index e51f375a..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_glossary.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-dl.glossary {
-  dd {
-    margin-left: 1.5em;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_math.scss b/src/sphinx_book_theme/assets/styles/content/_math.scss
deleted file mode 100644
index 900d9faa..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_math.scss
+++ /dev/null
@@ -1,43 +0,0 @@
-// Math and equations
-div.math {
-  position: relative;
-  display: flex;
-  flex-direction: row-reverse;
-  align-items: center;
-
-  .headerlink {
-    font-size: 1em;
-    padding: 0 0.2em;
-    margin-left: 0;
-
-    &:hover {
-      opacity: 1;
-    }
-  }
-
-  &:hover .headerlink {
-    opacity: 0.5;
-  }
-}
-
-// Equation labels to the right
-span.eqno {
-  font-size: 1.2em;
-  margin-left: 0.5em;
-}
-
-.MathJax {
-  overflow-x: auto;
-  margin-right: auto !important; // HACK: to over-ride MathJax default behavior
-  margin-left: auto !important;
-  @include scrollbar-style();
-
-  // HACK: Prevents vertical scroll-bar due to tiny padding bug
-  // The div should be high enough to fit all math anyway, so no vertical scroll needed
-  overflow-y: hidden;
-}
-
-// Compensate for the extra bottom margin of a preceding paragraph
-p ~ div.math {
-  margin-top: -1.15rem;
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_quotes.scss b/src/sphinx_book_theme/assets/styles/content/_quotes.scss
index 229993f2..2e9f06a0 100644
--- a/src/sphinx_book_theme/assets/styles/content/_quotes.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_quotes.scss
@@ -1,17 +1,14 @@
+/**
+ * Epigraphs and other "special" quote blocks
+ */
+ 
 blockquote {
-  margin: 1em;
-  padding: 0.2em 1.5em;
-  border-left: 4px solid #ccc;
-
   &.pull-quote,
   &.epigraph,
   &.highlights {
     font-size: 1.25em;
     border-left: none;
-  }
-
-  div > p {
-    margin-bottom: 0.5em;
+    background-color: var(--pst-color-background);
   }
 
   div > p + p.attribution {
diff --git a/src/sphinx_book_theme/assets/styles/content/_sidebar.scss b/src/sphinx_book_theme/assets/styles/content/_sidebar.scss
deleted file mode 100644
index 97c08b4c..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_sidebar.scss
+++ /dev/null
@@ -1,24 +0,0 @@
-// Sidebar-specific CSS
-div.sidebar,
-aside.sidebar {
-  &:not(.margin) {
-    background-color: unset;
-    padding: 1em;
-    border-radius: $box-border-radius;
-    border-color: $grey--medium;
-
-    // On wide screens, the sidebar straddles margin and content
-    @media (min-width: $breakpoint-lg) {
-      width: 65%;
-      margin: 0 -35% 0 $content-margin-gutter;
-    }
-  }
-  .admonition {
-    padding-left: 0.6rem;
-    padding-right: 0.8rem;
-  }
-  > p {
-    padding-left: 0rem;
-    padding-right: 0rem;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_tableofcontents.scss b/src/sphinx_book_theme/assets/styles/content/_tableofcontents.scss
deleted file mode 100644
index f34f49e3..00000000
--- a/src/sphinx_book_theme/assets/styles/content/_tableofcontents.scss
+++ /dev/null
@@ -1,49 +0,0 @@
-// Table of Contents in the UI
-div.tableofcontents-wrapper p.caption {
-  font-weight: 600 !important;
-  margin-bottom: 0em !important;
-}
-
-// Table of Contents wrapper in page content
-div.toctree-wrapper {
-  p.caption {
-    font-size: 1.4em;
-  }
-
-  > ul {
-    padding-left: 1.5em;
-
-    // Top-level links should be a bit bigger
-    > li > a {
-      font-size: 1.1em;
-    }
-  }
-}
-
-// In-page contents
-div.contents {
-  border-radius: $box-border-radius;
-  padding: 1em 1em 2em 1em; // More padding on bottom to match whitespace from title
-  p.topic-title {
-    font-size: 1.5em;
-    padding: 0 0 0 0.5em;
-    margin-bottom: 0;
-  }
-
-  // Style the first few levels of this so it looks nice
-  > ul {
-    list-style: none;
-    padding-left: 1em;
-
-    > li {
-      > ul {
-        padding-left: 1.5em;
-      }
-
-      > p > a {
-        font-size: 1.2em;
-        margin-bottom: 0.5em;
-      }
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/extensions/_ablog.scss b/src/sphinx_book_theme/assets/styles/extensions/_ablog.scss
deleted file mode 100644
index b8856560..00000000
--- a/src/sphinx_book_theme/assets/styles/extensions/_ablog.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-/*********************************************
-* ABlog *
-*********************************************/
-ul.ablog-archive {
-  padding-left: 0px;
-}
-
-/* In-page post lists */
-ul.postlist {
-  padding-left: 0;
-
-  > li > p:first-child {
-    font-size: 1.5em;
-  }
-
-  li {
-    + li {
-      margin-top: 2em;
-    }
-
-    > p > a {
-      font-style: normal;
-      font-size: 1.3em;
-    }
-  }
-}
-
-// Sidebar rules specifically for ABlog
-div.bd-sidebar {
-  h2 {
-    font-size: 1.5em;
-  }
-  h3 {
-    font-size: 1.4em;
-  }
-
-  > ul {
-    list-style: none;
-    padding-left: 0;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/extensions/comments.scss b/src/sphinx_book_theme/assets/styles/extensions/_comments.scss
similarity index 100%
rename from src/sphinx_book_theme/assets/styles/extensions/comments.scss
rename to src/sphinx_book_theme/assets/styles/extensions/_comments.scss
diff --git a/src/sphinx_book_theme/assets/styles/extensions/_myst-nb.scss b/src/sphinx_book_theme/assets/styles/extensions/_myst-nb.scss
deleted file mode 100644
index ca94928d..00000000
--- a/src/sphinx_book_theme/assets/styles/extensions/_myst-nb.scss
+++ /dev/null
@@ -1,41 +0,0 @@
-/*********************************************
-* MyST NB and Jupyter Notebooks *
-* ref: https://github.com/executablebooks/myst-nb
-*********************************************/
-div.cell {
-  div.highlight {
-    margin-bottom: 0em;
-  }
-
-  div.cell_input,
-  div.cell_output pre {
-    border-radius: $box-border-radius;
-    border: 1px #ccc solid;
-  }
-
-  div.cell_output {
-    padding-right: 0;
-  }
-
-  // On screens, we want to scoll, but on print show all
-  @mixin cell-scroll {
-    @include scrollbar-style();
-    max-height: 24em;
-    overflow-y: auto;
-    @media print {
-      max-height: unset;
-      overflow-y: visible;
-    }
-  }
-  &.tag_output_scroll,
-  &.tag_scroll-output {
-    div.cell_output {
-      @include cell-scroll;
-    }
-  }
-  &.tag_scroll-input {
-    div.cell_input {
-      @include cell-scroll;
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/extensions/_readthedocs.scss b/src/sphinx_book_theme/assets/styles/extensions/_readthedocs.scss
deleted file mode 100644
index 82059ad9..00000000
--- a/src/sphinx_book_theme/assets/styles/extensions/_readthedocs.scss
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * ReadTheDocs pop-up menu over-rides.
- * We nest everything under `.bd-sidebar-primary` so that we use more selective
- * selectors than what RTD CSS uses.
- */
-.bd-sidebar-primary {
-  // Parent container for everything else
-  div#rtd-footer-container {
-    position: sticky;
-    bottom: 0;
-  }
-  // Extra selective selector to over-ride RTD
-  .rst-versions.rst-badge {
-    position: unset;
-    font-size: 0.9em;
-
-    // This is the top part of the dropdown, lists the current versions
-    .rst-current-version {
-      display: flex;
-      align-items: center;
-      gap: 0.2rem;
-      height: 2.5rem;
-      transition: background-color 0.2s ease-out;
-      background-color: white;
-      color: $non-content-grey;
-      border-top: $border-thin;
-
-      @media (max-width: $breakpoint-md) {
-        // Slightly bigger on mobile so the button is more noticeable.
-        height: 3rem;
-      }
-
-      &:hover {
-        background-color: rgba(
-          var(--pst-color-sidebar-expander-background-hover),
-          1
-        );
-        cursor: pointer;
-      }
-
-      .fa {
-        color: $non-content-grey;
-      }
-
-      .fa-book {
-        float: unset;
-        margin-right: auto;
-
-        &:after {
-          content: "Read the Docs";
-          font-family: sans-serif;
-          font-weight: bold;
-          margin-left: 0.2em;
-        }
-      }
-    }
-
-    .rst-other-versions {
-      dt {
-        color: #ccc;
-      }
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/extensions/_sphinx-tabs.scss b/src/sphinx_book_theme/assets/styles/extensions/_sphinx-tabs.scss
deleted file mode 100644
index 8d036838..00000000
--- a/src/sphinx_book_theme/assets/styles/extensions/_sphinx-tabs.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-/*********************************************
-* Sphinx Tabs *
-* ref: https://github.com/executablebooks/sphinx-tabs
-*********************************************/
-div.sphinx-tabs > div.sphinx-menu {
-  padding: 0;
-}
-
-div.sphinx-tabs > div.sphinx-menu > a.item {
-  width: auto;
-  margin: 0px 0px -1px 0px;
-}
diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index ea51490b..333bef44 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -12,44 +12,25 @@
 
 // Basic styling applied throughout site
 @import "base/base";
-@import "base/bootstrap";
 @import "base/typography";
 @import "base/print";
 
 // Major theme layout, skeleton, and whitespace
-@import "sections/announcement";
-@import "sections/article";
-@import "sections/footer-article";
-@import "sections/footer-content";
+@import "sections/article-container";
 @import "sections/header-article";
-@import "sections/headers";
+@import "sections/header-primary";
 @import "sections/sidebar-primary";
 @import "sections/sidebar-secondary";
-@import "sections/sidebars-toggle";
 
 // Re-usable components across the theme
 @import "components/buttons";
-@import "components/search.scss";
 
 // Content blocks in standard Sphinx
-@import "content/code";
-@import "content/field-lists";
-@import "content/footnotes";
-@import "content/glossary";
 @import "content/images";
 @import "content/margin";
-@import "content/math";
 @import "content/quotes";
-@import "content/sidebar";
-@import "content/tableofcontents";
 
 // Content blocks from Sphinx extensions
-@import "extensions/ablog";
+
 @import "extensions/comments";
-@import "extensions/myst-nb";
-@import "extensions/sphinx-tabs";
-@import "extensions/readthedocs";
 @import "extensions/thebe";
-
-// Page-specific CSS
-@import "pages/search";
diff --git a/src/sphinx_book_theme/assets/styles/pages/_search.scss b/src/sphinx_book_theme/assets/styles/pages/_search.scss
deleted file mode 100644
index 5bfceb8b..00000000
--- a/src/sphinx_book_theme/assets/styles/pages/_search.scss
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Search page special-cases
- */
-
-#search-input::placeholder {
-  color: var(--pst-color-text-muted);
-}
-
-// Turn off the extra search UI at the top of the page
-.bd-search-container {
-  padding: 2rem;
-  h1 {
-    display: none;
-  }
-  form:first-of-type {
-    display: none !important;
-  }
-
-  // Whitespace
-  div#search-results {
-    padding: 2rem;
-    > h2 {
-      margin-top: 0;
-    }
-  }
-  // The results of a search
-  ul.search {
-    margin: 0;
-    list-style: none;
-
-    li {
-      background-image: none;
-      padding: 0;
-      margin-bottom: 1em;
-      padding-bottom: 1em;
-      border-bottom: $border-thin;
-      border-top: none;
-
-      // First link is the page title, it should be a bit bigger
-      > a {
-        font-size: 1.2em;
-      }
-
-      div.context,
-      p.context {
-        margin: 0.5em 0 0 0;
-
-        // Add a # before page section titles to make it clear they are sections
-        a:before {
-          content: "#";
-          padding-right: 0.2em;
-          color: $grey--medium;
-        }
-      }
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_announcement.scss b/src/sphinx_book_theme/assets/styles/sections/_announcement.scss
deleted file mode 100644
index 5ff068f9..00000000
--- a/src/sphinx_book_theme/assets/styles/sections/_announcement.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.bd-header-announcement {
-  background-color: var(--sbt-color-announcement);
-  color: #fff;
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
new file mode 100644
index 00000000..6edbdbc7
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
@@ -0,0 +1,8 @@
+.bd-main .bd-content .bd-article-container {
+  // Re-adjust padding defaults to be flush on the top and right
+  padding-top: 0;
+  padding-right: 0;
+
+  // Unset overflow x so that sticky: top works for the article header
+  overflow-x: unset;
+}
\ No newline at end of file
diff --git a/src/sphinx_book_theme/assets/styles/sections/_article.scss b/src/sphinx_book_theme/assets/styles/sections/_article.scss
deleted file mode 100644
index 5e8ac3ae..00000000
--- a/src/sphinx_book_theme/assets/styles/sections/_article.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/*********************************************
-* Main content layout *
-*********************************************/
-.bd-main {
-  .bd-content {
-    padding: 0rem;
-    justify-content: revert;
-    .bd-article-container {
-      position: relative; // needed for postion:sticky header-article
-      overflow-x: unset; // needed for postion:sticky header-article
-      padding: 0%;
-      min-width: 0; // to prevent overflow in mobile website for flex containers
-    }
-    .bd-article {
-      padding-right: 2rem;
-      @media (max-width: $breakpoint-md) {
-        padding-left: 1rem;
-        padding-right: 1rem;
-      }
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-article.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-article.scss
deleted file mode 100644
index 77a1285a..00000000
--- a/src/sphinx_book_theme/assets/styles/sections/_footer-article.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-/*********************************************
-* Footer - article *
-*********************************************/
-
-// Previous and next area at the bottom
-footer.bd-footer-article {
-  border-top: none;
-  padding: 0;
-
-  .prev-next-area {
-    font-size: var(--sbt-prevnext-font-size);
-
-    p.prev-next-title {
-      color: var(--pst-color-link);
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
deleted file mode 100644
index 24ea7d9c..00000000
--- a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-/*********************************************
-* Footer - content *
-*********************************************/
-footer {
-  font-size: var(--sbt-font-size-small-1);
-  &.bd-footer-content {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 15px;
-    border-top: 1px solid #ccc;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index 1917bf46..98ee1094 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -2,24 +2,28 @@
 * Top Bar *
 * TODO: Rename much of these to article-header to conform with sphinx-basic-ng
 *********************************************/
+// Wrapper container
 .bd-header-article {
   height: $header-article-height; // Fix the height so the TOC doesn't grow it
-  background-color: white;
+  background-color: var(--pst-color-background);
   transition: left 0.2s;
-  font-size: var(--sbt-header-article-font-size);
+  font-size: .9em;
   position: sticky;
   top: 0;
+  padding-top: 0;
   z-index: 1018;
-
+  
   @include header-height-mobile;
 
   .scrolled & {
     box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
   }
 
+  // Inner container with content
   .header-article-main {
     height: $header-article-height;
     @include header-height-mobile;
+    padding: 0 !important;  // Override bootstrap default
 
     .header-article__left,
     .header-article__right {
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
new file mode 100644
index 00000000..d6223106
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
@@ -0,0 +1,3 @@
+.bd-header {
+  display: none;
+}
\ No newline at end of file
diff --git a/src/sphinx_book_theme/assets/styles/sections/_headers.scss b/src/sphinx_book_theme/assets/styles/sections/_headers.scss
deleted file mode 100644
index e8504158..00000000
--- a/src/sphinx_book_theme/assets/styles/sections/_headers.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * A few different header CSS rules
- */
-.header-item {
-  width: 100%;
-  text-align: center;
-
-  &:empty {
-    display: none;
-  }
-
-  &.announcement {
-    background-color: #616161;
-    color: white;
-    padding: 0.4em 12.5%; // Horizontal padding so the width is 75%
-
-    @media (max-width: $breakpoint-md) {
-      // Announcements can take a bit more width on mobile
-      padding: 0.4em 2%;
-    }
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index b0f054e1..a9f60fce 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -1,122 +1,31 @@
 /*********************************************
 * Left Nav Bar *
 *********************************************/
+
 .bd-sidebar-primary {
-  padding-top: 0;
-  padding: 0em;
-  flex-basis: $leftbar-width-wide;
-  font-size: var(--sbt-sidebar-font-size);
-  top: 0px !important;
-  max-height: 100vh;
-  max-width: 100%;
-  background: white;
-  border-right: $border-thin;
   transition: margin-left $animation-time ease 0s,
-    opacity $animation-time ease 0s, visibility $animation-time ease 0s;
-  overflow-y: unset; // To over-ride the pydata theme and allow for sticky items
-  @include fill-vertical-screen-space();
-
-  // On mobile, behave like a slide-out drawer
-  @media (max-width: $breakpoint-md) {
-    position: fixed;
-    width: $leftbar-width-mobile;
-    max-width: 300px;
-    font-size: 1.2em;
-    z-index: $zindex-offcanvas;
-  }
-
-  // The container for the sidebar content (stuff that isn't the RTD button)
-  .bd-sidebar__content {
-    overflow-y: auto;
-    flex-grow: 1;
-    display: flex;
-    flex-direction: column;
-    @include scrollbar-style();
-    @include scrollbar-on-hover();
-  }
-
-  // Apply some basic padding so the dropdown buttons don't overlap w/ scrollbar
-  .sidebar-start-items,
-  .sidebar-end-items {
-    padding: 1rem 1rem 1rem 1.5rem;
-  }
-
-  // This should always snap to the bottom even if there's no sidebar content
-  .sidebar-end-items {
-    margin-top: auto;
-    margin-bottom: 2em;
-  }
-
-  nav ul.nav {
-    // Sidebar link color
-    li a,
-    ul li a {
-      color: $non-content-grey;
-      padding-right: 1.5rem;
-    }
-    a:hover,
-    li.active > a,
-    li.active > a:hover {
-      color: var(--pst-color-link);
-    }
+      opacity $animation-time ease 0s, visibility $animation-time ease 0s;
 
-    // Adjust padding to be a bit tighter
-    ul {
-      padding-left: 1rem;
-    }
+  .navbar-brand {
+    height: unset;
   }
 
-  h1.site-logo {
-    margin: 0.5em 0 0 0;
-    font-size: 1.1em;
-    color: black;
-    text-align: center;
+  // Remove the header items that pop into the sidebar in the pydata theme
+  .sidebar-header-items {
+    display: none;
   }
-
-  div.navbar_extra_footer {
-    text-align: center;
-    font-size: 0.9em;
-    color: $non-content-grey;
-    margin-bottom: 3em;
-  }
-
-  // Single page
-  &.single-page {
-    border-right: 0;
-  }
-}
-
-div.navbar-brand-box {
-  @media (min-width: $breakpoint-md) {
-    padding-top: 2em;
-  }
-
-  a.navbar-brand {
-    width: 100%;
-    height: auto;
-    flex-direction: column;
-
-    img {
-      display: block;
-      height: auto;
-      width: auto;
-      max-height: 10vh;
-      max-width: 100%;
-      margin: 0 auto;
-      @media (min-width: $breakpoint-md) {
-        max-height: 15vh !important;
-      }
-    }
+  
+  // Remove the top border since there's no header items above
+  .sidebar-start-items {
+    border-top: none;
   }
 }
 
-nav.bd-links {
-  margin-left: 0px; // Because the PST adds margin by default
-  p.caption,
-  .toctree-l1 a {
-    padding-left: 0em;
+// Default visibility for left sidebar is the reverse of what it is on mobile.
+// Mobile behavior is defined in the pydata sphinx theme
+@media (min-width: 960px) {
+  input#__primary:checked~.bd-container .bd-sidebar-primary {
+    margin-left: -$leftbar-width-wide;
+    visibility: hidden;
   }
-  // Overriding PyData Theme Defaults so the navigation is always visible
-  overflow-y: visible;
-  max-height: none;
 }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 413e5afa..f655f725 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -3,131 +3,7 @@
 *********************************************/
 
 .bd-sidebar-secondary {
-  padding: 0px !important;
-  right: -1em;
-  height: auto;
-  position: static; // .toc-item is made sticky so that z-index works well, for margin content
-  max-height: unset;
-  overflow-y: unset;
-  max-width: 25%;
-  flex: 0 0 25%;
-  transition: margin-right 0.25s ease 0s, opacity 0.25s ease 0s,
-    visibility 0.25s ease 0s;
-
-  .tocsection {
-    padding: 0.5rem 1rem !important;
-    .scrolled & {
-      box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
-    }
-
-    &:after {
-      content: "\f107";
-      font-family: "Font Awesome 5 Free";
-      font-weight: 900;
-      padding-left: 0.5em;
-      transition: opacity 0.3s ease;
-    }
-  }
-
-  // Show / hide the in-page TOC items
-  @mixin show-inpage-toc {
-    nav {
-      max-height: 90vh;
-      opacity: 1;
-      overflow-y: auto;
-    }
-
-    // Hide the arrow when we display the toc
-    .tocsection:after {
-      opacity: 0;
-    }
-  }
-
-  .toc-item {
-    padding: 0rem;
-    position: sticky; // this is made sticky so that z-index works well, for margin content
-    z-index: 3;
-    top: 0;
-    height: auto;
-    background: white;
-    // On wide screens, show the TOC with hover or w/ a show class
-    &:hover {
-      @include show-inpage-toc;
-    }
-  }
-
-  &.show {
-    @include show-inpage-toc;
-  }
-
-  .toc-h2 {
-    font-size: 0.85rem;
-  }
-  // Colors
-  div.onthispage,
-  .toc-entry a {
-    color: $non-content-grey;
-  }
-
-  // On narrow screens, this should be offset to the right side until button is clicked
-  @media (max-width: $breakpoint-md) {
-    z-index: $zindex-offcanvas;
-    top: 0;
-    right: 0;
-    position: fixed;
-    height: 100%;
-    width: $toc-width-mobile;
-    max-width: 300px;
-    background-color: white;
-    border-left: $border-thin;
-
-    // Fonts are a bit bigger on mobile, and nested headers get smaller
-    font-size: 1.4em;
-
-    li {
-      font-size: 0.8em;
-    }
-  }
-
-  // By default the nav is hidden unless a few conditions are met
-  nav {
-    opacity: 1;
-    max-height: 0;
-    overflow-y: hidden;
-    background: white;
-    transition: opacity 0.4s ease, max-height 0.7s ease;
-    @include scrollbar-style();
-    @include scrollbar-on-hover();
-    // TOC link color
-    a:hover,
-    li.active > a.active {
-      color: var(--pst-color-link);
-    }
-
-    li.active > a.active {
-      border-left: 2px solid var(--pst-color-link);
-    }
-  }
-
-  // On narrow screens, it should always be shown because it's off to the right
-  @media (max-width: $breakpoint-md) {
-    @include show-inpage-toc;
-  }
-
-  @media (min-width: $breakpoint-md) {
-    max-width: 25%; // taken from col-md-3 used in prev HTML
-    .toc-item {
-      border-left: 1px solid var(--pst-color-border);
-    }
-  }
-
-  .toc-entry a.nav-link {
-    padding: 0.125rem 1rem !important;
-    margin-left: 0rem;
-  }
-
-  // Make sure the pydata sphinx theme edit button doesn't show up
-  div.editthispage {
-    display: none;
-  }
-}
+  // Remove padding so that it's flush on the top and left
+  padding-top: 0;
+  padding-left: 0;
+}
\ No newline at end of file
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebars-toggle.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebars-toggle.scss
deleted file mode 100644
index 91bcb204..00000000
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebars-toggle.scss
+++ /dev/null
@@ -1,77 +0,0 @@
-/**************************************************
-* Rules that are specific to toggling the sidebar *
-**************************************************/
-input.sidebar-toggle {
-  display: none;
-  position: absolute;
-}
-
-input#__primary {
-  // On wide screens, checking will hide everything
-  @media (min-width: $breakpoint-md) {
-    &:checked {
-      & ~ .bd-container .bd-sidebar {
-        visibility: hidden;
-        opacity: 0;
-        margin-left: -$leftbar-width-wide;
-      }
-
-      // When we hide the sidebar on widescreen, add some padding to content
-      & ~ .bd-container .bd-main {
-        padding-left: 4rem;
-        padding-right: 4rem;
-      }
-    }
-  }
-
-  // On narrow screens, *unchecking* will hide everything, so it's hidden by default
-  @media (max-width: $breakpoint-md) {
-    &:not(:checked) ~ .bd-container .bd-sidebar {
-      visibility: hidden;
-      opacity: 0;
-      margin-left: -$leftbar-width-mobile;
-    }
-  }
-}
-
-input#__secondary {
-  // On narrow screens, it's hidden by default
-  @media (max-width: $breakpoint-md) {
-    &:not(:checked) ~ .bd-container .bd-toc {
-      visibility: hidden;
-      opacity: 0;
-      margin-right: -$leftbar-width-mobile;
-    }
-  }
-}
-
-// **** Utility functions ****
-// Label at the top of the page
-label.overlay {
-  &.overlay-primary,
-  &.overlay-secondary {
-    background-color: rgba(0, 0, 0, 0.54);
-  }
-  height: 0;
-  opacity: 0;
-  position: fixed;
-  top: 0;
-  transition: width 0ms, height 0ms, opacity $animation-time ease-out;
-  width: 0;
-}
-
-// On narrow screens, we use this overlay to close the sidebar
-@media (max-width: $breakpoint-md) {
-  input:checked + label.overlay {
-    &.overlay-primary {
-      z-index: $zindex-offcanvas - 1; // This puts it just below the primary sidebar
-    }
-
-    &.overlay-secondary {
-      z-index: $zindex-sticky - 1; // This puts it just below the header
-    }
-    height: 100%;
-    opacity: 1;
-    width: 100%;
-  }
-}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/components/author.html b/src/sphinx_book_theme/theme/sphinx_book_theme/components/author.html
new file mode 100644
index 00000000..c92f5642
--- /dev/null
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/components/author.html
@@ -0,0 +1,5 @@
+{% if author %}
+<p class="component-author">
+{{ translate('By') }} {{ author }}
+</p>
+{% endif %}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/components/extra-footer.html b/src/sphinx_book_theme/theme/sphinx_book_theme/components/extra-footer.html
new file mode 100644
index 00000000..d6c1d90b
--- /dev/null
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/components/extra-footer.html
@@ -0,0 +1,5 @@
+{%- if theme_extra_footer %}
+<div class="extra_footer">
+  {{ theme_extra_footer }}
+</div>
+{%- endif %}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header.html b/src/sphinx_book_theme/theme/sphinx_book_theme/components/sidebar-icons.html
similarity index 100%
rename from src/sphinx_book_theme/theme/sphinx_book_theme/sections/header.html
rename to src/sphinx_book_theme/theme/sphinx_book_theme/components/sidebar-icons.html
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/components/toc-button.html b/src/sphinx_book_theme/theme/sphinx_book_theme/components/toc-button.html
deleted file mode 100644
index 950a0d06..00000000
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/components/toc-button.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<label class="d-block d-md-none nav-toggle-button headerbtn" for="__secondary">
-  <div class="visually-hidden">{{ translate('Toggle Table of Contents') }}</div>
-  <i class="fas fa-list"></i>
-</label>
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html b/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
index ade964cf..0d56fc1f 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
@@ -1,23 +1,15 @@
 {% extends "pydata_sphinx_theme/layout.html" %}
 {# ref: https://github.com/pydata/pydata-sphinx-theme/blob/master/src/pydata_sphinx_theme/theme/pydata_sphinx_theme/layout.html #}
 
-{% set is_single_page = (theme_single_page == True) or (theme_single_page == "True") %}
-
 {% block docs_main %}
-<!-- A tiny helper pixel to detect if we've scrolled -->
+{# A tiny helper pixel to detect if we've scrolled #}
 <div class="sbt-scroll-pixel-helper"></div>
 {{ super() }}
 {% endblock %}
 
-{# Secondary sidebar #}
-{% block docs_toc %}
-{% if not remove_sidebar_secondary %}
-    {% include "sections/sidebar-secondary.html" %}
-{% endif %}
-{% endblock %}
 
 {% block docs_body %}
-<!-- Table of contents that is only displayed when printing the page -->
+{# Table of contents that is only displayed when printing the page #}
 <div id="jb-print-docs-body" class="onlyprint">
     <h1>{{ pagetitle }}</h1>
     <!-- Table of contents -->
@@ -37,9 +29,3 @@ <h2> {{ translate(theme_toc_title) }} </h2>
 </div>
 {{ super() }}
 {% endblock %}
-
-{% block docs_navbar %}
-{% endblock %}
-
-{%- block footer %}
-{%- endblock %}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/footer-content.html b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/footer-content.html
index c6d94894..1f7140d3 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/footer-content.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/footer-content.html
@@ -1,20 +1,9 @@
-<p>
-  {% if author %}
-    {{ translate('By') }} {{ author }}<br/>
-  {% endif %}
-  {%- if show_copyright %}
-    {%- if hasdoc('copyright') %}
-      {% trans prefix=translate('Copyright'), path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">{{ prefix }}</a> {{ copyright }}.{% endtrans %}<br/>
-    {%- else %}
-      {% trans prefix=translate('Copyright'), copyright=copyright|e %}&copy; {{ prefix }} {{ copyright }}.{% endtrans %}<br/>
-    {%- endif %}
-  {%- endif %}
-  {%- if last_updated %}
-    {% trans prefix=translate('Last updated on'), last_updated=last_updated|e %}{{ prefix }} {{ last_updated }}.{% endtrans %}<br/>
-  {%- endif %}
-  {%- if theme_extra_footer %}
-    <div class="extra_footer">
-      {{ theme_extra_footer }}
-    </div>
-  {%- endif %}
-</p>
+{#- This is essentially sections/footer.html but in the content footer #}
+{# because we don't have a full-width footer in this theme-#}
+<div class="bd-footer-content__inner container">
+  {% for footer_item in theme_footer_content_items %}
+  <div class="footer-item">
+    {% include footer_item %}
+  </div>
+  {% endfor %}
+</div>
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-primary.html b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-primary.html
deleted file mode 100644
index 4fbed576..00000000
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-primary.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% block docs_sidebar %}
-
-{% if sidebars and not is_single_page%}
-    <div class="bd-sidebar__content">
-        <div class="sidebar-start-items">
-            {%- for sidebartemplate in sidebars %}
-            {%- include sidebartemplate %}
-            {%- endfor %}
-        </div>
-        <div class="sidebar-end-items">
-            {%- for leftsidebartemplate in theme_left_sidebar_end %}
-            {%- include leftsidebartemplate %}
-            {%- endfor %}
-            {% if theme_navbar_footer_text %}{% set theme_extra_navbar=theme_navbar_footer_text %}{% endif %} <!-- To handle the deprecated key -->
-            {% if theme_extra_navbar %}
-                <div class="navbar_extra_footer">
-                {{ theme_extra_navbar }}
-                </div>
-            {% endif %}
-        </div>
-    </div>
-    <div id="rtd-footer-container"></div>
-{% endif %}
-{% endblock %}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-secondary.html b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-secondary.html
deleted file mode 100644
index e083adaf..00000000
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar-secondary.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- Table of contents -->
-{% set page_toc = generate_toc_html() %}
-{% block docs_toc %}
-<div class="bd-sidebar-secondary bd-toc show noprint">
-    {%- if page_toc | length >= 1 %}
-    <div class="toc-item">
-        <div class="tocsection onthispage">
-            <i class="fas fa-list"></i> {{ translate(theme_toc_title) }}
-        </div>
-        <nav id="bd-toc-nav" aria-label="Page">
-            {{ page_toc }}
-        </nav>
-    </div>
-    {%- endif %}
-</div>
-{% endblock %}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar.html b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/sidebar.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
index 122d36ba..97fec3bc 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
@@ -1,22 +1,20 @@
 [theme]
 inherit = pydata_sphinx_theme
 pygments_style = tango
-sidebars = sidebar-logo.html, search-field.html, sbt-sidebar-nav.html
+sidebars = navbar-logo.html, search-field.html, sbt-sidebar-nav.html
 stylesheet = styles/sphinx-book-theme.css
 
 [options]
 announcement =
 single_page = False
-# DEPRECATE after a few release cycles
-expand_toc_sections = []
+secondary_sidebar_items = page-toc  # Removes the extra page-specific links from sidebar
+footer_content_items = author.html, copyright.html, last-updated.html, extra-footer.html
 path_to_docs =
 repository_url =
 repository_branch =
 launch_buttons = {}
 home_page_in_toc = False
 logo_only =
-# DEPRECATE after a few release cycles
-navbar_footer_text =
 show_navbar_depth = 1
 toc_title = Contents
 extra_navbar = Theme by the <a href="https://ebp.jupyterbook.org">Executable Book Project</a>
@@ -28,3 +26,7 @@ use_issues_button = False
 use_repository_button = False
 use_sidenotes = False
 # Note: We also inherit use_edit_page_button from the PyData theme
+
+# DEPRECATE after a few release cycles
+expand_toc_sections = []
+navbar_footer_text =

From 26b350815865b6cd8f5a8e1084eca3a472e7f114 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 7 Nov 2022 10:23:50 +0000
Subject: [PATCH 02/65] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/sphinx_book_theme/__init__.py                           | 3 +--
 src/sphinx_book_theme/assets/scripts/index.js               | 1 -
 src/sphinx_book_theme/assets/styles/content/_quotes.scss    | 2 +-
 .../assets/styles/sections/_article-container.scss          | 2 +-
 .../assets/styles/sections/_header-article.scss             | 6 +++---
 .../assets/styles/sections/_header-primary.scss             | 2 +-
 .../assets/styles/sections/_sidebar-primary.scss            | 6 +++---
 .../assets/styles/sections/_sidebar-secondary.scss          | 2 +-
 8 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index 6c327c81..d1d65f5a 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -180,10 +180,9 @@ def update_general_config(app, config):
     config.templates_path.append(os.path.join(theme_dir, "components"))
 
 
-
 def update_templates(app, pagename, templatename, context, doctree):
     """Update template names and assets for page build.
-    
+
     This is a copy of what the pydata theme does here to include a new section
     - https://github.com/pydata/pydata-sphinx-theme/blob/0a4894fab49befc59eb497811949a1d0ede626eb/src/pydata_sphinx_theme/__init__.py#L173
     """
diff --git a/src/sphinx_book_theme/assets/scripts/index.js b/src/sphinx_book_theme/assets/scripts/index.js
index f1763676..32df18af 100644
--- a/src/sphinx_book_theme/assets/scripts/index.js
+++ b/src/sphinx_book_theme/assets/scripts/index.js
@@ -159,7 +159,6 @@ var initThebeSBT = () => {
   initThebe();
 };
 
-
 /**
  * Add no print class to certain DOM elements
  */
diff --git a/src/sphinx_book_theme/assets/styles/content/_quotes.scss b/src/sphinx_book_theme/assets/styles/content/_quotes.scss
index 2e9f06a0..f203aed5 100644
--- a/src/sphinx_book_theme/assets/styles/content/_quotes.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_quotes.scss
@@ -1,7 +1,7 @@
 /**
  * Epigraphs and other "special" quote blocks
  */
- 
+
 blockquote {
   &.pull-quote,
   &.epigraph,
diff --git a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
index 6edbdbc7..6c189d49 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
@@ -5,4 +5,4 @@
 
   // Unset overflow x so that sticky: top works for the article header
   overflow-x: unset;
-}
\ No newline at end of file
+}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index 98ee1094..fb880649 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -7,12 +7,12 @@
   height: $header-article-height; // Fix the height so the TOC doesn't grow it
   background-color: var(--pst-color-background);
   transition: left 0.2s;
-  font-size: .9em;
+  font-size: 0.9em;
   position: sticky;
   top: 0;
   padding-top: 0;
   z-index: 1018;
-  
+
   @include header-height-mobile;
 
   .scrolled & {
@@ -23,7 +23,7 @@
   .header-article-main {
     height: $header-article-height;
     @include header-height-mobile;
-    padding: 0 !important;  // Override bootstrap default
+    padding: 0 !important; // Override bootstrap default
 
     .header-article__left,
     .header-article__right {
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
index d6223106..94fd454d 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-primary.scss
@@ -1,3 +1,3 @@
 .bd-header {
   display: none;
-}
\ No newline at end of file
+}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index a9f60fce..8e0dc02c 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -4,7 +4,7 @@
 
 .bd-sidebar-primary {
   transition: margin-left $animation-time ease 0s,
-      opacity $animation-time ease 0s, visibility $animation-time ease 0s;
+    opacity $animation-time ease 0s, visibility $animation-time ease 0s;
 
   .navbar-brand {
     height: unset;
@@ -14,7 +14,7 @@
   .sidebar-header-items {
     display: none;
   }
-  
+
   // Remove the top border since there's no header items above
   .sidebar-start-items {
     border-top: none;
@@ -24,7 +24,7 @@
 // Default visibility for left sidebar is the reverse of what it is on mobile.
 // Mobile behavior is defined in the pydata sphinx theme
 @media (min-width: 960px) {
-  input#__primary:checked~.bd-container .bd-sidebar-primary {
+  input#__primary:checked ~ .bd-container .bd-sidebar-primary {
     margin-left: -$leftbar-width-wide;
     visibility: hidden;
   }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index f655f725..eb7e196b 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -6,4 +6,4 @@
   // Remove padding so that it's flush on the top and left
   padding-top: 0;
   padding-left: 0;
-}
\ No newline at end of file
+}

From 27250880c75920cd14a4fb7ba02a8d42cb96a73c Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Mon, 7 Nov 2022 11:29:14 +0100
Subject: [PATCH 03/65] Fixing tox

---
 src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf | 3 ++-
 tox.ini                                                  | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
index 97fec3bc..40502132 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
@@ -7,7 +7,8 @@ stylesheet = styles/sphinx-book-theme.css
 [options]
 announcement =
 single_page = False
-secondary_sidebar_items = page-toc  # Removes the extra page-specific links from sidebar
+# Removes the extra page-specific links from sidebar
+secondary_sidebar_items = page-toc
 footer_content_items = author.html, copyright.html, last-updated.html, extra-footer.html
 path_to_docs =
 repository_url =
diff --git a/tox.ini b/tox.ini
index 75757c5b..c21b5375 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,6 +41,10 @@ extras =
 deps =
     sphinx-theme-builder[cli]
 commands =
+    ###### REMOVE THIS BEFORE MERGING PR
+    ###### OR WHEN NEW PYDATA THEME IS RELEASED
+    pip install git+https://github.com/pydata/pydata-sphinx-theme
+    ######
     stb serve docs --open-browser
 
 [testenv:py{37,38,39}-sphinx{3,4}]

From b9570fbd702714cfb4b81a6e6cecfe444808f032 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 15 Nov 2022 15:17:08 +1100
Subject: [PATCH 04/65] typo

---
 docs/customize/footer-content.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/customize/footer-content.md b/docs/customize/footer-content.md
index 7e67d092..80ef2efc 100644
--- a/docs/customize/footer-content.md
+++ b/docs/customize/footer-content.md
@@ -1,6 +1,6 @@
 # Customize the content footer
 
-There is a content footer that spans the wisth of the page, and is visibile when you scroll to the bottom of the content.
+There is a content footer that spans the width of the page, and is visibile when you scroll to the bottom of the content.
 
 By default, the content footer has the following items:
 

From d12b6091354bb5c5e17b133d8607eb77faf2e0f3 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sat, 19 Nov 2022 19:31:50 +1100
Subject: [PATCH 05/65] bd article p-r-2

---
 .../assets/styles/sections/_article-container.scss             | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
index 6c189d49..e2d49bb2 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
@@ -5,4 +5,7 @@
 
   // Unset overflow x so that sticky: top works for the article header
   overflow-x: unset;
+  .bd-article {
+    padding-right: 2rem;
+  }
 }

From 7ea4c08432f8f639b22c3bdae2f1caffc48461fd Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 21 Nov 2022 01:51:06 +1100
Subject: [PATCH 06/65] footer and secondary sidebar

---
 src/sphinx_book_theme/assets/scripts/index.js |  4 +-
 .../assets/styles/content/_margin.scss        |  2 +
 .../styles/sections/_article-container.scss   |  1 +
 .../styles/sections/_sidebar-secondary.scss   | 85 +++++++++++++++++++
 .../theme/sphinx_book_theme/layout.html       |  3 +
 5 files changed, 93 insertions(+), 2 deletions(-)

diff --git a/src/sphinx_book_theme/assets/scripts/index.js b/src/sphinx_book_theme/assets/scripts/index.js
index 32df18af..04e29c39 100644
--- a/src/sphinx_book_theme/assets/scripts/index.js
+++ b/src/sphinx_book_theme/assets/scripts/index.js
@@ -97,9 +97,9 @@ var initTocHide = () => {
 
     // Hide the TOC if any margin content is displayed on the screen
     if (onScreenItems.length > 0) {
-      $("div.bd-sidebar-secondary").removeClass("show");
+      $("div.bd-sidebar-secondary").addClass("hide");
     } else {
-      $("div.bd-sidebar-secondary").addClass("show");
+      $("div.bd-sidebar-secondary").removeClass("hide");
     }
   };
   let manageScrolledClassOnBody = (entries, observer) => {
diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index dc4b40d3..c5e9950d 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -91,6 +91,8 @@ aside.margin,
 figure.margin,
 .cell.tag_popout,
 .cell.tag_margin {
+  z-index: 2;
+  position: relative;
   @include margin-content();
 
   // Make cell outputs take up more space if they're in the margin
diff --git a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
index e2d49bb2..2a819b60 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
@@ -5,6 +5,7 @@
 
   // Unset overflow x so that sticky: top works for the article header
   overflow-x: unset;
+  min-width: 0; // prevent from overflowing the flex container
   .bd-article {
     padding-right: 2rem;
   }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index eb7e196b..1468cbe8 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -3,6 +3,91 @@
 *********************************************/
 
 .bd-sidebar-secondary {
+  position: static; // .toc-item is made sticky so that z-index works well, for margin content
+  max-height: unset;
+  overflow-y: unset;
+
+  .tocsection {
+    padding: 0.5rem 1rem !important;
+    .scrolled & {
+      box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
+    }
+
+    &:after {
+      opacity: 0;
+    }
+  }
+
+  // Show / hide the in-page TOC items
+  @mixin hide-inpage-toc {
+    nav {
+      opacity: 1;
+      max-height: 0;
+      overflow-y: hidden;
+      margin-bottom: 0rem;
+    }
+
+    // Hide the arrow when we display the toc
+    .tocsection:after {
+      opacity: 1;
+      content: "\f107";
+      font-family: "Font Awesome 5 Free";
+      font-weight: 900;
+      padding-left: 0.5em;
+      transition: opacity 0.3s ease;
+    }
+  }
+
+  .toc-item {
+    padding: 0rem;
+    position: sticky; // this is made sticky so that z-index works well, for margin content
+    z-index: 3;
+    top: 0;
+    height: auto;
+    background: white;
+  }
+
+  &.hide {
+    @include hide-inpage-toc;
+  }
+
+  .toc-h2 {
+    font-size: 0.85rem;
+  }
+
+  // On narrow screens, this should be offset to the right side until button is clicked
+  @media (max-width: $breakpoint-md) {
+    z-index: $zindex-offcanvas;
+    top: 0;
+    right: 0;
+    position: fixed;
+    height: 100%;
+    width: $toc-width-mobile;
+    max-width: 300px;
+    background-color: white;
+
+    // Fonts are a bit bigger on mobile, and nested headers get smaller
+    font-size: 1.4em;
+
+    li {
+      font-size: 0.8em;
+    }
+  }
+
+  // By default the nav is shown
+  nav {
+    max-height: 90vh;
+    opacity: 1;
+    overflow-y: auto;
+    background: white;
+    transition: opacity 0.4s ease, max-height 0.7s ease;
+    @include scrollbar-style();
+    @include scrollbar-on-hover();
+    a.nav-link {
+      margin-left: 0rem;
+    }
+  }
+
   // Remove padding so that it's flush on the top and left
   padding-top: 0;
   padding-left: 0;
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html b/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
index 0d56fc1f..8ddb4944 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
@@ -29,3 +29,6 @@ <h2> {{ translate(theme_toc_title) }} </h2>
 </div>
 {{ super() }}
 {% endblock %}
+
+{%- block footer %}
+{%- endblock %}
\ No newline at end of file

From 18d8788ba235ccfd6df318f085fcbf92347e7ee7 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Sun, 20 Nov 2022 14:51:19 +0000
Subject: [PATCH 07/65] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 src/sphinx_book_theme/theme/sphinx_book_theme/layout.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html b/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
index 8ddb4944..29d9ee4d 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/layout.html
@@ -31,4 +31,4 @@ <h2> {{ translate(theme_toc_title) }} </h2>
 {% endblock %}
 
 {%- block footer %}
-{%- endblock %}
\ No newline at end of file
+{%- endblock %}

From 6fb24ee315b384f2869841834d35bfc1430d1e35 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 22 Nov 2022 23:11:30 +1100
Subject: [PATCH 08/65] had to add _footer-content.scss, as pydata does not
 have any style

---
 src/sphinx_book_theme/assets/styles/index.scss |  1 +
 .../styles/sections/_footer-content.scss       | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 src/sphinx_book_theme/assets/styles/sections/_footer-content.scss

diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index 333bef44..5100d849 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -21,6 +21,7 @@
 @import "sections/header-primary";
 @import "sections/sidebar-primary";
 @import "sections/sidebar-secondary";
+@import "sections/footer-content";
 
 // Re-usable components across the theme
 @import "components/buttons";
diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
new file mode 100644
index 00000000..e1277eac
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
@@ -0,0 +1,18 @@
+/*********************************************
+* Footer - content *
+*********************************************/
+footer {
+    font-size: var(--sbt-font-size-small-1);
+    &.bd-footer-content {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 15px;
+      border-top: 1px solid #ccc;
+      .bd-footer-content__inner {
+        padding-left: 0px;
+        p {
+            margin-bottom: 0px;
+        }
+      }
+    }
+}
\ No newline at end of file

From cca9a25b01d681ba9b17e9d4d03e87226372cd9b Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 22 Nov 2022 12:11:46 +0000
Subject: [PATCH 09/65] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .../styles/sections/_footer-content.scss      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
index e1277eac..52a55d5e 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
@@ -2,17 +2,17 @@
 * Footer - content *
 *********************************************/
 footer {
-    font-size: var(--sbt-font-size-small-1);
-    &.bd-footer-content {
-      display: flex;
-      flex-wrap: wrap;
-      padding: 15px;
-      border-top: 1px solid #ccc;
-      .bd-footer-content__inner {
-        padding-left: 0px;
-        p {
-            margin-bottom: 0px;
-        }
+  font-size: var(--sbt-font-size-small-1);
+  &.bd-footer-content {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 15px;
+    border-top: 1px solid #ccc;
+    .bd-footer-content__inner {
+      padding-left: 0px;
+      p {
+        margin-bottom: 0px;
       }
     }
-}
\ No newline at end of file
+  }
+}

From 52be8714bee3e85c5bf8e1d2d6c073d8fd357f5f Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 22 Nov 2022 23:12:28 +1100
Subject: [PATCH 10/65] had to add _footer-content.scss, as pydata does not
 have any style

---
 .../styles/sections/_footer-content.scss      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
index e1277eac..52a55d5e 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
@@ -2,17 +2,17 @@
 * Footer - content *
 *********************************************/
 footer {
-    font-size: var(--sbt-font-size-small-1);
-    &.bd-footer-content {
-      display: flex;
-      flex-wrap: wrap;
-      padding: 15px;
-      border-top: 1px solid #ccc;
-      .bd-footer-content__inner {
-        padding-left: 0px;
-        p {
-            margin-bottom: 0px;
-        }
+  font-size: var(--sbt-font-size-small-1);
+  &.bd-footer-content {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 15px;
+    border-top: 1px solid #ccc;
+    .bd-footer-content__inner {
+      padding-left: 0px;
+      p {
+        margin-bottom: 0px;
       }
     }
-}
\ No newline at end of file
+  }
+}

From 5ef980ef15c785fe1fc2e0bd93ded104e0675675 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 23 Nov 2022 11:44:44 +1100
Subject: [PATCH 11/65] hide the header btn on wide screens

---
 .../assets/styles/components/_buttons.scss            | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/components/_buttons.scss b/src/sphinx_book_theme/assets/styles/components/_buttons.scss
index d6620e01..78e16225 100644
--- a/src/sphinx_book_theme/assets/styles/components/_buttons.scss
+++ b/src/sphinx_book_theme/assets/styles/components/_buttons.scss
@@ -92,3 +92,14 @@
     font-size: 1.2em; // Slightly smaller icons in a dropdown
   }
 }
+
+/**
+ * In-page table of contents
+ */
+.headerbtn-secondary {
+  // Hide the button on wide screens since we display the TOC.
+  display: block;
+  @media (min-width: $breakpoint-md) {
+    display: none;
+  }
+}

From 3631c067e7819f6096d1dfd2212549a9746d99b8 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 24 Nov 2022 11:14:36 +1100
Subject: [PATCH 12/65] bd-main flex-grow is not necessary in sbt

---
 src/sphinx_book_theme/assets/styles/index.scss             | 1 +
 src/sphinx_book_theme/assets/styles/sections/_article.scss | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 src/sphinx_book_theme/assets/styles/sections/_article.scss

diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index 5100d849..03f04790 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -16,6 +16,7 @@
 @import "base/print";
 
 // Major theme layout, skeleton, and whitespace
+@import "sections/article";
 @import "sections/article-container";
 @import "sections/header-article";
 @import "sections/header-primary";
diff --git a/src/sphinx_book_theme/assets/styles/sections/_article.scss b/src/sphinx_book_theme/assets/styles/sections/_article.scss
new file mode 100644
index 00000000..7d5ee93d
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/sections/_article.scss
@@ -0,0 +1,3 @@
+.bd-main {
+  flex-grow: 0;
+}

From aa2a93ac7da664cd8b1d290612a8752aa98666b3 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 24 Nov 2022 23:47:39 +1100
Subject: [PATCH 13/65] removing unnecessary style/mixins and adding some

---
 .../assets/styles/abstracts/_mixins.scss      |  41 -------
 .../styles/sections/_article-container.scss   |   4 +-
 .../styles/sections/_header-article.scss      |   2 +-
 .../styles/sections/_sidebar-secondary.scss   | 107 ++++++++----------
 4 files changed, 48 insertions(+), 106 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss b/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
index 42eb45b8..d43358ee 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
@@ -1,35 +1,6 @@
 /*********************************************
 * SASS Mixins
 *********************************************/
-/**
-* Scrollbars should be thinner and slightly rounded, with a grey background
-*/
-@mixin scrollbar-style() {
-  &::-webkit-scrollbar {
-    width: 0.3rem;
-    height: 0.3rem;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: #c1c1c1;
-    border-radius: 0.25rem;
-
-    &:hover {
-      background: #a0a0a0;
-    }
-  }
-}
-
-/**
-* Hide the scrollbar until the element is overed, so keep the page clean
-*/
-@mixin scrollbar-on-hover() {
-  &:not(:hover) {
-    &::-webkit-scrollbar-thumb {
-      visibility: hidden;
-    }
-  }
-}
 
 /**
  * Header behavior on mobile
@@ -39,15 +10,3 @@
     height: $header-article-height + 0.75em;
   }
 }
-
-/**
- * Forces an element to fill the vertical screen space,
- * but uses % on mobile because `vh` units behave weirdly on mobile.
- * ref: https://stackoverflow.com/questions/37112218/css3-100vh-not-constant-in-mobile-browser
- */
-@mixin fill-vertical-screen-space {
-  height: 100vh; // On wide screens force this to take up the whole viewport
-  @media (max-width: $breakpoint-md) {
-    height: 100%; // So that height behaves properly on mobile
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
index 2a819b60..7248e1bd 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_article-container.scss
@@ -1,12 +1,12 @@
 .bd-main .bd-content .bd-article-container {
   // Re-adjust padding defaults to be flush on the top and right
-  padding-top: 0;
-  padding-right: 0;
+  padding: 0rem;
 
   // Unset overflow x so that sticky: top works for the article header
   overflow-x: unset;
   min-width: 0; // prevent from overflowing the flex container
   .bd-article {
     padding-right: 2rem;
+    padding-left: 2rem;
   }
 }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index fb880649..1d828c02 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -10,7 +10,7 @@
   font-size: 0.9em;
   position: sticky;
   top: 0;
-  padding-top: 0;
+  padding: 0 1rem;
   z-index: 1018;
 
   @include header-height-mobile;
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 1468cbe8..508e2816 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -3,21 +3,6 @@
 *********************************************/
 
 .bd-sidebar-secondary {
-  position: static; // .toc-item is made sticky so that z-index works well, for margin content
-  max-height: unset;
-  overflow-y: unset;
-
-  .tocsection {
-    padding: 0.5rem 1rem !important;
-    .scrolled & {
-      box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
-    }
-
-    &:after {
-      opacity: 0;
-    }
-  }
-
   // Show / hide the in-page TOC items
   @mixin hide-inpage-toc {
     nav {
@@ -28,64 +13,62 @@
     }
 
     // Hide the arrow when we display the toc
-    .tocsection:after {
-      opacity: 1;
-      content: "\f107";
-      font-family: "Font Awesome 5 Free";
-      font-weight: 900;
-      padding-left: 0.5em;
-      transition: opacity 0.3s ease;
+    .tocsection {
+      .scrolled & {
+        box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
+      }
+      &:after {
+        opacity: 1;
+        content: "\f107";
+        font-family: "Font Awesome 5 Free";
+        font-weight: 900;
+        padding-left: 0.5em;
+        transition: opacity 0.3s ease;
+      }
     }
   }
 
-  .toc-item {
-    padding: 0rem;
-    position: sticky; // this is made sticky so that z-index works well, for margin content
-    z-index: 3;
-    top: 0;
-    height: auto;
-    background: white;
-  }
-
-  &.hide {
-    @include hide-inpage-toc;
-  }
-
-  .toc-h2 {
-    font-size: 0.85rem;
+  @mixin show-inpage-toc {
+    nav {
+      max-height: 90vh;
+      opacity: 1;
+      overflow-y: auto;
+      background: white;
+      transition: opacity 0.4s ease, max-height 0.7s ease;
+    }
   }
 
-  // On narrow screens, this should be offset to the right side until button is clicked
-  @media (max-width: $breakpoint-md) {
-    z-index: $zindex-offcanvas;
-    top: 0;
-    right: 0;
-    position: fixed;
-    height: 100%;
-    width: $toc-width-mobile;
-    max-width: 300px;
-    background-color: white;
-
-    // Fonts are a bit bigger on mobile, and nested headers get smaller
-    font-size: 1.4em;
+  @media (min-width: $breakpoint-md) {
+    position: static; // .toc-item is made sticky so that z-index works well, for margin content
+    max-height: unset;
+    overflow-y: unset;
+    .tocsection {
+      padding: 0.5rem 1rem !important;
+    }
+    .toc-item {
+      padding: 0rem;
+      position: sticky; // this is made sticky so that z-index works well, for margin content
+      z-index: 3;
+      top: 0;
+      height: auto;
+      background: white;
+      // On wide screens, show the TOC with hover or w/ a show class
+      &:hover {
+        @include show-inpage-toc;
+      }
+    }
+    a.nav-link {
+      margin-left: 0rem;
+    }
 
-    li {
-      font-size: 0.8em;
+    &.hide {
+      @include hide-inpage-toc;
     }
   }
 
   // By default the nav is shown
   nav {
-    max-height: 90vh;
-    opacity: 1;
-    overflow-y: auto;
-    background: white;
-    transition: opacity 0.4s ease, max-height 0.7s ease;
-    @include scrollbar-style();
-    @include scrollbar-on-hover();
-    a.nav-link {
-      margin-left: 0rem;
-    }
+    @include show-inpage-toc();
   }
 
   // Remove padding so that it's flush on the top and left

From fa16d07177b69b4e000b0c7b349df7efde5ed8e3 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 24 Nov 2022 23:51:26 +1100
Subject: [PATCH 14/65] adding noqa

---
 src/sphinx_book_theme/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index d1d65f5a..fff2c2be 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -184,7 +184,7 @@ def update_templates(app, pagename, templatename, context, doctree):
     """Update template names and assets for page build.
 
     This is a copy of what the pydata theme does here to include a new section
-    - https://github.com/pydata/pydata-sphinx-theme/blob/0a4894fab49befc59eb497811949a1d0ede626eb/src/pydata_sphinx_theme/__init__.py#L173
+    - https://github.com/pydata/pydata-sphinx-theme/blob/0a4894fab49befc59eb497811949a1d0ede626eb/src/pydata_sphinx_theme/__init__.py#L173 # noqa: E501
     """
     # Allow for more flexibility in template names
     template_sections = ["theme_footer_content_items"]

From fbf16bf085b8a4a641632f28b8edb039f2a3e8d4 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Fri, 25 Nov 2022 00:27:50 +1100
Subject: [PATCH 15/65] removing unnecessary class and editing sidebar
 secondary option

---
 src/sphinx_book_theme/assets/styles/base/_base.scss | 13 -------------
 .../theme/sphinx_book_theme/theme.conf              |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/base/_base.scss b/src/sphinx_book_theme/assets/styles/base/_base.scss
index 75653d23..8a00b1c4 100644
--- a/src/sphinx_book_theme/assets/styles/base/_base.scss
+++ b/src/sphinx_book_theme/assets/styles/base/_base.scss
@@ -10,19 +10,6 @@
   left: 0;
 }
 
-// Hide an element without display: none but so that it takes no space
-.visually-hidden {
-  clip: rect(0, 0, 0, 0) !important;
-  border: 0 !important;
-  height: 1px !important;
-  margin: -1px !important;
-  overflow: hidden !important;
-  padding: 0 !important;
-  position: absolute !important;
-  white-space: nowrap !important;
-  width: 1px !important;
-}
-
 // We define our own display-none class since bootstrap uses !important and we want to be able to over-ride
 .d-n {
   display: none;
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
index 40502132..41253e7c 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
@@ -8,7 +8,7 @@ stylesheet = styles/sphinx-book-theme.css
 announcement =
 single_page = False
 # Removes the extra page-specific links from sidebar
-secondary_sidebar_items = page-toc
+secondary_sidebar_items = page-toc.html
 footer_content_items = author.html, copyright.html, last-updated.html, extra-footer.html
 path_to_docs =
 repository_url =

From a7d9b07c0d07639a4dd056bae1e4c4d5ec392ec7 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Fri, 25 Nov 2022 00:37:09 +1100
Subject: [PATCH 16/65] removing sidebar secondary buttons

---
 .../assets/styles/sections/_sidebar-secondary.scss       | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 508e2816..ac94a99a 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -71,6 +71,15 @@
     @include show-inpage-toc();
   }
 
+  // Make sure the pydata sphinx theme edit button doesn't show up
+  div.editthispage {
+    display: none;
+  }
+
+  div.sourceLink {
+    display: none;
+  }
+
   // Remove padding so that it's flush on the top and left
   padding-top: 0;
   padding-left: 0;

From e3b5046bb52ff7a4a689e3776ebc3dd515be81c7 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Fri, 25 Nov 2022 00:43:58 +1100
Subject: [PATCH 17/65] hiding source link

---
 .../assets/styles/sections/_sidebar-secondary.scss              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index ac94a99a..5d95ac8c 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -76,7 +76,7 @@
     display: none;
   }
 
-  div.sourceLink {
+  div.sourcelink {
     display: none;
   }
 

From d2237ee2d8be28989f42a0acaf2a97124648286b Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Fri, 25 Nov 2022 13:54:48 +1100
Subject: [PATCH 18/65] pydata version

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1d3ff833..2011aa5f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [
   "sphinx>=4,<6",
-  "pydata-sphinx-theme~=0.10.1",
+  "pydata-sphinx-theme~=0.12.0",
   "pyyaml",
 ]
 

From bf3b8de81c72b3653a9627eac9ddd2475ebd3100 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Fri, 25 Nov 2022 14:41:03 +1100
Subject: [PATCH 19/65] span.sidenote and span.marginnote z-index

---
 src/sphinx_book_theme/assets/styles/content/_margin.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index c5e9950d..2402c121 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -76,6 +76,8 @@ input.margin-toggle {
 
 span.sidenote,
 span.marginnote {
+  z-index: 2;
+  position: relative;
   sup {
     user-select: none;
   }

From f3ae6ff822d4817eb2e6ce2e7408b9ca80c3800e Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Fri, 25 Nov 2022 16:58:35 +1100
Subject: [PATCH 20/65] citation style

---
 src/sphinx_book_theme/assets/styles/base/_typography.scss | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/base/_typography.scss b/src/sphinx_book_theme/assets/styles/base/_typography.scss
index 93a29f8a..29283c04 100644
--- a/src/sphinx_book_theme/assets/styles/base/_typography.scss
+++ b/src/sphinx_book_theme/assets/styles/base/_typography.scss
@@ -11,3 +11,10 @@
     color: var(--pst-color-text-muted);
   }
 }
+
+// counteracting pydata style on a::before, for citation style
+a.brackets::before {
+  color: inherit;
+  font-family: inherit;
+  margin-right: 0rem;
+}

From bdf4a9d711fccd7629fdcf0727385550e55cb11c Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 00:10:58 +1100
Subject: [PATCH 21/65] google link

---
 tests/sites/base/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/sites/base/index.md b/tests/sites/base/index.md
index a1186b5b..c08e5daf 100644
--- a/tests/sites/base/index.md
+++ b/tests/sites/base/index.md
@@ -7,5 +7,5 @@ page1
 page2
 section1/index
 titles/index
-https://google.com
+Google <https://google.com>
 ```

From e9baa59415c3b55b95e69887bb5560f4d4ef63a6 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 13:30:18 +1100
Subject: [PATCH 22/65] dependency changes

---
 docs/conf.py                                      | 2 +-
 pyproject.toml                                    | 6 +++---
 tests/sites/base/conf.py                          | 2 +-
 tests/test_build/build__sidebar-primary__nav.html | 4 ++--
 tests/test_build/test_right_sidebar_title.html    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 22bc47f5..2ff47caa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -97,7 +97,7 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 html_css_files = ["custom.css"]
-jupyter_execute_notebooks = "cache"
+nb_execution_mode = "cache"
 thebe_config = {
     "repository_url": "https://github.com/binder-examples/jupyter-stacks-datascience",
     "repository_branch": "master",
diff --git a/pyproject.toml b/pyproject.toml
index 2011aa5f..73f7f349 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -53,11 +53,11 @@ doc = [
     "numpy",
     "matplotlib",
     "numpydoc",
-    "myst-nb~=0.13.2",
+    "myst-nb~=0.16.0",
     "nbclient",
     "pandas",
     "plotly",
-    "sphinx~=4.0",
+    "sphinx>=4.0,<6",
     "sphinx-design",
     "sphinx-examples",
     "sphinx-copybutton",
@@ -71,7 +71,7 @@ doc = [
 test = [
     "beautifulsoup4>=4.6.1,<5",
     "coverage",
-    "myst-nb~=0.13.2",
+    "myst-nb~=0.16.0",
     "pytest~=7.1",
     "pytest-cov>=3,<5",
     "pytest-regressions>=2.0.1,<2.5.0",
diff --git a/tests/sites/base/conf.py b/tests/sites/base/conf.py
index c778039b..0bffb0c3 100644
--- a/tests/sites/base/conf.py
+++ b/tests/sites/base/conf.py
@@ -15,7 +15,7 @@
 html_theme = "sphinx_book_theme"
 html_copy_source = True
 html_sourcelink_suffix = ""
-jupyter_execute_notebooks = "auto"
+nb_execution_mode = "auto"
 
 # Base options, we can add other key/vals later
 html_theme_options = {
diff --git a/tests/test_build/build__sidebar-primary__nav.html b/tests/test_build/build__sidebar-primary__nav.html
index 88298cb4..94e0b544 100644
--- a/tests/test_build/build__sidebar-primary__nav.html
+++ b/tests/test_build/build__sidebar-primary__nav.html
@@ -22,7 +22,7 @@
     </a>
     <input class="toctree-checkbox" id="toctree-checkbox-1" name="toctree-checkbox-1" type="checkbox">
      <label class="toctree-toggle" for="toctree-checkbox-1">
-      <i class="fas fa-chevron-down">
+      <i class="fa-solid fa-chevron-down">
       </i>
      </label>
      <ul>
@@ -60,7 +60,7 @@
     </a>
     <input class="toctree-checkbox" id="toctree-checkbox-2" name="toctree-checkbox-2" type="checkbox">
      <label class="toctree-toggle" for="toctree-checkbox-2">
-      <i class="fas fa-chevron-down">
+      <i class="fa-solid fa-chevron-down">
       </i>
      </label>
      <ul>
diff --git a/tests/test_build/test_right_sidebar_title.html b/tests/test_build/test_right_sidebar_title.html
index 37e4ce6a..0063b265 100644
--- a/tests/test_build/test_right_sidebar_title.html
+++ b/tests/test_build/test_right_sidebar_title.html
@@ -1,5 +1,5 @@
 <div class="tocsection onthispage">
- <i class="fas fa-list">
+ <i class="fa-solid fa-list">
  </i>
  My Contents
 </div>

From 89b8201a9fdb19a8671ce0a53f6fdc1959238592 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 13:42:51 +1100
Subject: [PATCH 23/65] file changes

---
 tests/test_build/build__sidebar-primary__nav.html | 2 +-
 tests/test_build/test_right_sidebar_title.html    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_build/build__sidebar-primary__nav.html b/tests/test_build/build__sidebar-primary__nav.html
index 94e0b544..eea395f7 100644
--- a/tests/test_build/build__sidebar-primary__nav.html
+++ b/tests/test_build/build__sidebar-primary__nav.html
@@ -84,7 +84,7 @@
    </li>
    <li class="toctree-l1">
     <a class="reference external" href="https://google.com">
-     https://google.com
+     Google
     </a>
    </li>
   </ul>
diff --git a/tests/test_build/test_right_sidebar_title.html b/tests/test_build/test_right_sidebar_title.html
index 0063b265..cfb30025 100644
--- a/tests/test_build/test_right_sidebar_title.html
+++ b/tests/test_build/test_right_sidebar_title.html
@@ -1,5 +1,5 @@
 <div class="tocsection onthispage">
  <i class="fa-solid fa-list">
  </i>
- My Contents
+ On this page
 </div>

From 2d84c2ab2a6518cd68ff24342c3575e73238075a Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 14:20:06 +1100
Subject: [PATCH 24/65] no print for sidebar secondary

---
 src/sphinx_book_theme/assets/scripts/index.js             | 1 +
 tests/test_build/build__pagetoc--page-multipletitles.html | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/sphinx_book_theme/assets/scripts/index.js b/src/sphinx_book_theme/assets/scripts/index.js
index 04e29c39..3ebfda12 100644
--- a/src/sphinx_book_theme/assets/scripts/index.js
+++ b/src/sphinx_book_theme/assets/scripts/index.js
@@ -165,6 +165,7 @@ var initThebeSBT = () => {
 
 function addNoPrint() {
   $("div.bd-sidebar-primary").addClass("noprint");
+  $("div.bd-sidebar-secondary").addClass("noprint");
   $("div.bd-header-article").addClass("noprint");
   $("div.bd-header-announcement").addClass("noprint");
   $("footer.bd-footer-article").addClass("noprint");
diff --git a/tests/test_build/build__pagetoc--page-multipletitles.html b/tests/test_build/build__pagetoc--page-multipletitles.html
index 81f29615..1ce12cef 100644
--- a/tests/test_build/build__pagetoc--page-multipletitles.html
+++ b/tests/test_build/build__pagetoc--page-multipletitles.html
@@ -1,11 +1,11 @@
-<div class="bd-sidebar-secondary bd-toc show noprint">
+<div class="bd-sidebar-secondary bd-toc noprint">
  <div class="toc-item">
   <div class="tocsection onthispage">
-   <i class="fas fa-list">
+   <i class="fa-solid fa-list">
    </i>
-   Contents
+   On this page
   </div>
-  <nav aria-label="Page" id="bd-toc-nav">
+  <nav class="page-toc" id="bd-toc-nav">
    <ul class="visible nav section-nav flex-column">
     <li class="toc-h1 nav-item toc-entry">
      <a class="reference internal nav-link" href="#">

From 7ec48bcd87c902a44eae2ec6e65b52c6678d3e88 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 20:03:22 +1100
Subject: [PATCH 25/65] adding sphinx 4,5 in tox and secondary sidebar now
 won't show up when no headings present

---
 tests/test_build.py                              | 16 ++++++++++------
 .../build__pagetoc--page-multipletitles.html     |  2 +-
 .../build__pagetoc--page-onetitle.html           |  8 ++++----
 .../build__pagetoc--page-onetitlenoheadings.html |  2 +-
 tox.ini                                          |  4 ++--
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/tests/test_build.py b/tests/test_build.py
index f05c2350..68591425 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -128,12 +128,16 @@ def test_build_book(sphinx_build_factory, file_regression):
     for page in sphinx_build.outdir.joinpath("titles").rglob("**/page-*"):
         page_html = BeautifulSoup(page.read_text("utf8"), "html.parser")
         page_toc = page_html.find("div", attrs={"class": "bd-toc"})
-        file_regression.check(
-            page_toc.prettify(),
-            basename=f"build__pagetoc--{page.with_suffix('').name}",
-            extension=".html",
-            encoding="utf8",
-        )
+        if page_toc:
+            file_regression.check(
+                page_toc.prettify(),
+                basename=f"build__pagetoc--{page.with_suffix('').name}",
+                extension=".html",
+                encoding="utf8",
+            )
+        else:
+            # page with no subheadings now does not have the secondary sidebar markup
+            assert len(page_html.find_all("section")) == 1
 
 
 def test_navbar_options_home_page_in_toc(sphinx_build_factory):
diff --git a/tests/test_build/build__pagetoc--page-multipletitles.html b/tests/test_build/build__pagetoc--page-multipletitles.html
index 1ce12cef..8eb96899 100644
--- a/tests/test_build/build__pagetoc--page-multipletitles.html
+++ b/tests/test_build/build__pagetoc--page-multipletitles.html
@@ -1,4 +1,4 @@
-<div class="bd-sidebar-secondary bd-toc noprint">
+<div class="bd-sidebar-secondary bd-toc">
  <div class="toc-item">
   <div class="tocsection onthispage">
    <i class="fa-solid fa-list">
diff --git a/tests/test_build/build__pagetoc--page-onetitle.html b/tests/test_build/build__pagetoc--page-onetitle.html
index 2ddeaa7b..4fb8e175 100644
--- a/tests/test_build/build__pagetoc--page-onetitle.html
+++ b/tests/test_build/build__pagetoc--page-onetitle.html
@@ -1,11 +1,11 @@
-<div class="bd-sidebar-secondary bd-toc show noprint">
+<div class="bd-sidebar-secondary bd-toc">
  <div class="toc-item">
   <div class="tocsection onthispage">
-   <i class="fas fa-list">
+   <i class="fa-solid fa-list">
    </i>
-   Contents
+   On this page
   </div>
-  <nav aria-label="Page" id="bd-toc-nav">
+  <nav class="page-toc" id="bd-toc-nav">
    <ul class="visible nav section-nav flex-column">
     <li class="toc-h2 nav-item toc-entry">
      <a class="reference internal nav-link" href="#here-s-a-sub-heading">
diff --git a/tests/test_build/build__pagetoc--page-onetitlenoheadings.html b/tests/test_build/build__pagetoc--page-onetitlenoheadings.html
index 250ec2d6..dde1aee4 100644
--- a/tests/test_build/build__pagetoc--page-onetitlenoheadings.html
+++ b/tests/test_build/build__pagetoc--page-onetitlenoheadings.html
@@ -1,2 +1,2 @@
-<div class="bd-sidebar-secondary bd-toc show noprint">
+<div class="bd-sidebar-secondary bd-toc">
 </div>
diff --git a/tox.ini b/tox.ini
index c21b5375..8a1ea7a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -47,9 +47,9 @@ commands =
     ######
     stb serve docs --open-browser
 
-[testenv:py{37,38,39}-sphinx{3,4}]
+[testenv:py{37,38,39}-sphinx{4,5}]
 extras = test
 deps =
-    sphinx3: sphinx>=3,<4
     sphinx4: sphinx>=4,<5
+    sphinx5: sphinx>=5,<6
 commands = pytest {posargs}

From a42a616d4dcf58433bfbdd1acecb0b4269931362 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 23:26:14 +1100
Subject: [PATCH 26/65] deprecating single_page, extra navbar,
 navbar_footer_text html options

---
 docs/conf.py                                   |  2 --
 docs/customize/index.md                        |  7 -------
 docs/customize/sidebar-primary.md              | 15 ---------------
 docs/customize/single-page.md                  | 14 --------------
 .../sections/header-article.html               |  2 --
 .../theme/sphinx_book_theme/theme.conf         |  3 ---
 tests/test_build.py                            | 18 ------------------
 7 files changed, 61 deletions(-)
 delete mode 100644 docs/customize/single-page.md

diff --git a/docs/conf.py b/docs/conf.py
index 2ff47caa..24c9bbf5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -129,9 +129,7 @@
     # For testing
     # "use_fullscreen_button": False,
     # "home_page_in_toc": True,
-    # "single_page": True,
     # "extra_footer": "<a href='https://google.com'>Test</a>",  # DEPRECATED KEY
-    # "extra_navbar": "<a href='https://google.com'>Test</a>",
     # "show_navbar_depth": 2,
 }
 
diff --git a/docs/customize/index.md b/docs/customize/index.md
index 74771041..f613b8b3 100644
--- a/docs/customize/index.md
+++ b/docs/customize/index.md
@@ -12,9 +12,6 @@ The following options are available via `html_theme_options`
 * - Key
   - Type
   - Description
-* - `single_page`
-  - bool
-  - Remove the left sidebar and treat the site as a single page. See [](customize:single-page).
 * - `path_to_docs`
   - string
   - Path to the documentation, relative to the repository root (e.g. `docs/`). See [](customize:source-files).
@@ -48,9 +45,6 @@ The following options are available via `html_theme_options`
 * - `show_navbar_depth`
   - int
   - Show children in the navigation bar down to the depth listed here. See [](sidebar:navbar-depth).
-* - `extra_navbar`
-  - str
-  - Extra HTML to add below the sidebar footer. See [](custom-footer).
 * - `extra_footer`
   - str
   - Extra HTML to add in the footer of each page.
@@ -72,5 +66,4 @@ header.md
 download.md
 source-files.md
 custom-css.md
-single-page.md
 ```
diff --git a/docs/customize/sidebar-primary.md b/docs/customize/sidebar-primary.md
index b959aab4..39510caf 100644
--- a/docs/customize/sidebar-primary.md
+++ b/docs/customize/sidebar-primary.md
@@ -38,21 +38,6 @@ By default, this theme comes with these three theme-specific sidebar elements en
 - `sbt-sidebar-nav.html`: A bootstrap-based navigation menu for your book.
 - `sbt-sidebar-footer`: A [configurable](custom-footer) snippet of HTML to add to the sidebar (by default it is placed at the bottom).
 
-(custom-footer)=
-## Customize the sidebar footer
-
-You may choose your own HTML to include in the footer of your sidebar (or set it to be empty). To do so, set the following option in `conf.py`:
-
-```python
-html_theme_options = {
-    ...
-    "extra_navbar": "<p>Your HTML</p>",
-    ...
-}
-```
-
-This text will be placed at the bottom of the sidebar by default.
-
 
 ## Add a header to your Table of Contents
 
diff --git a/docs/customize/single-page.md b/docs/customize/single-page.md
deleted file mode 100644
index 5b1bd571..00000000
--- a/docs/customize/single-page.md
+++ /dev/null
@@ -1,14 +0,0 @@
-(customize:single-page)=
-# Use a single-page version of this theme
-
-If your documentation only has a single page, and you don't need the left
-navigation bar, then you may configure `sphinx-book-theme` to run in **single page mode**
-with the following configuration:
-
-```python
-html_theme_options = {
-    ...
-    "single_page": True
-    ...
-}
-```
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html
index 8863d125..9538c4b1 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html
@@ -4,9 +4,7 @@
 
 <div class="col py-1 d-flex header-article-main">
     <div class="header-article__left">
-        {% if theme_single_page != True %}
         {{ render_label_input_button(for_input="__primary", tooltip="Toggle navigation", icon="fas fa-bars", tooltip_placement="right") }}
-        {% endif %}
     </div>
     <div class="header-article__right">
         {%- for button in header_buttons -%}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
index 41253e7c..f0f8ea41 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/theme.conf
@@ -6,7 +6,6 @@ stylesheet = styles/sphinx-book-theme.css
 
 [options]
 announcement =
-single_page = False
 # Removes the extra page-specific links from sidebar
 secondary_sidebar_items = page-toc.html
 footer_content_items = author.html, copyright.html, last-updated.html, extra-footer.html
@@ -18,7 +17,6 @@ home_page_in_toc = False
 logo_only =
 show_navbar_depth = 1
 toc_title = Contents
-extra_navbar = Theme by the <a href="https://ebp.jupyterbook.org">Executable Book Project</a>
 extra_footer =
 use_download_button = True
 use_fullscreen_button = True
@@ -30,4 +28,3 @@ use_sidenotes = False
 
 # DEPRECATE after a few release cycles
 expand_toc_sections = []
-navbar_footer_text =
diff --git a/tests/test_build.py b/tests/test_build.py
index 68591425..0330d27b 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -153,27 +153,9 @@ def test_navbar_options_home_page_in_toc(sphinx_build_factory):
     assert "Index with code in title" in str(li)
 
 
-def test_navbar_options_single_page(sphinx_build_factory):
-    """Test that"""
-    sphinx_build = sphinx_build_factory(
-        "base", confoverrides={"html_theme_options.single_page": True}
-    ).build(
-        assert_pass=True
-    )  # type: SphinxBuild
-    sidebar = sphinx_build.html_tree("section1", "ntbk.html").find(
-        "div", attrs={"class": "bd-sidebar-primary"}
-    )
-    assert len(sidebar.find_all("div")) == 0  # Sidebar should be empty
-    # HTML structure for below assertion is not supported in the latest version,
-    # the class just removes a border as of now, which we can do without.
-    # assert "single-page" in sidebar.attrs["class"]  # Class added on single page
-
-
 @pytest.mark.parametrize(
     "option,value",
     [
-        ("extra_navbar", "<div>EXTRA NAVBAR</div>"),
-        ("navbar_footer_text", "<div>EXTRA NAVBAR</div>"),
         ("extra_footer", "<div>EXTRA FOOTER</div>"),
     ],
 )

From 149827f475ab1f1e99a4c437012f6f7e6166a0f2 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Sun, 27 Nov 2022 23:38:47 +1100
Subject: [PATCH 27/65] execution_show_tb to nb_execution_show_tb

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 24c9bbf5..88be1fa5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -140,7 +140,7 @@
 fontawesome_included = True
 post_auto_image = 1
 post_auto_excerpt = 2
-execution_show_tb = "READTHEDOCS" in os.environ
+nb_execution_show_tb = "READTHEDOCS" in os.environ
 bibtex_bibfiles = ["references.bib"]
 # To test that style looks good with common bibtex config
 bibtex_reference_style = "author_year"

From 8e70b2facf3b2eb223bd6935c62300eac9e4c9df Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Nov 2022 00:16:35 +1100
Subject: [PATCH 28/65] table style

---
 src/sphinx_book_theme/assets/styles/base/_typography.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/base/_typography.scss b/src/sphinx_book_theme/assets/styles/base/_typography.scss
index 29283c04..c88ae5c3 100644
--- a/src/sphinx_book_theme/assets/styles/base/_typography.scss
+++ b/src/sphinx_book_theme/assets/styles/base/_typography.scss
@@ -18,3 +18,7 @@ a.brackets::before {
   font-family: inherit;
   margin-right: 0rem;
 }
+
+table {
+  position: relative;
+}

From 6b047140409ae43564166b819c4e4a6a92749727 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Nov 2022 17:15:13 +1100
Subject: [PATCH 29/65] urlib.parse warning and custom-footer link removal

---
 docs/conf.py                      | 2 +-
 docs/customize/sidebar-primary.md | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 88be1fa5..5b652fc0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -145,7 +145,7 @@
 # To test that style looks good with common bibtex config
 bibtex_reference_style = "author_year"
 bibtex_default_style = "plain"
-
+numpydoc_show_class_members = False  # for urllib.parse autodoc stub file issue
 linkcheck_ignore = [
     "http://someurl/release",  # This is a fake link
     "https://doi.org",  # These don't resolve properly and cause SSL issues
diff --git a/docs/customize/sidebar-primary.md b/docs/customize/sidebar-primary.md
index 39510caf..a762f3ad 100644
--- a/docs/customize/sidebar-primary.md
+++ b/docs/customize/sidebar-primary.md
@@ -36,7 +36,6 @@ By default, this theme comes with these three theme-specific sidebar elements en
 - `sidebar-logo.html`: Displays the logo and site title.
 - `search-field.html`: A bootstrap-based search bar (from the [PyData Sphinx Theme](https://pydata-sphinx-theme.readthedocs.io/))
 - `sbt-sidebar-nav.html`: A bootstrap-based navigation menu for your book.
-- `sbt-sidebar-footer`: A [configurable](custom-footer) snippet of HTML to add to the sidebar (by default it is placed at the bottom).
 
 
 ## Add a header to your Table of Contents

From 554087610c620841ee9e59061493b69165d5f94d Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 28 Nov 2022 23:28:55 +1100
Subject: [PATCH 30/65] images with fixed height/width

---
 docs/conf.py                                             | 2 +-
 src/sphinx_book_theme/assets/styles/content/_images.scss | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 5b652fc0..57a0e8ca 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -145,7 +145,7 @@
 # To test that style looks good with common bibtex config
 bibtex_reference_style = "author_year"
 bibtex_default_style = "plain"
-numpydoc_show_class_members = False  # for urllib.parse autodoc stub file issue
+numpydoc_show_class_members = False  # for automodule:: urllib.parse stub file issue
 linkcheck_ignore = [
     "http://someurl/release",  # This is a fake link
     "https://doi.org",  # These don't resolve properly and cause SSL issues
diff --git a/src/sphinx_book_theme/assets/styles/content/_images.scss b/src/sphinx_book_theme/assets/styles/content/_images.scss
index 3d07eed5..3a27eedc 100644
--- a/src/sphinx_book_theme/assets/styles/content/_images.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_images.scss
@@ -63,3 +63,8 @@ div.figure {
     font-size: 0.9rem;
   }
 }
+
+.logo__image {
+  width: 20em;
+  height: 4em;
+}

From d944d0e5ab72883e8adc8f1e1fa97ebe12072872 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 29 Nov 2022 22:50:57 +1100
Subject: [PATCH 31/65] search page style and fading of primary sidebar

---
 .../assets/styles/components/_search.scss                 | 8 ++++++++
 src/sphinx_book_theme/assets/styles/content/_images.scss  | 5 -----
 src/sphinx_book_theme/assets/styles/index.scss            | 1 +
 .../assets/styles/sections/_sidebar-primary.scss          | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 src/sphinx_book_theme/assets/styles/components/_search.scss

diff --git a/src/sphinx_book_theme/assets/styles/components/_search.scss b/src/sphinx_book_theme/assets/styles/components/_search.scss
new file mode 100644
index 00000000..cc3ec024
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/components/_search.scss
@@ -0,0 +1,8 @@
+.bd-search-container {
+  margin: 2em;
+  #search-results {
+    h2:first-child {
+      display: none;
+    }
+  }
+}
diff --git a/src/sphinx_book_theme/assets/styles/content/_images.scss b/src/sphinx_book_theme/assets/styles/content/_images.scss
index 3a27eedc..3d07eed5 100644
--- a/src/sphinx_book_theme/assets/styles/content/_images.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_images.scss
@@ -63,8 +63,3 @@ div.figure {
     font-size: 0.9rem;
   }
 }
-
-.logo__image {
-  width: 20em;
-  height: 4em;
-}
diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index 03f04790..cd6f83fc 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -26,6 +26,7 @@
 
 // Re-usable components across the theme
 @import "components/buttons";
+@import "components/search";
 
 // Content blocks in standard Sphinx
 @import "content/images";
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index 8e0dc02c..9df15e27 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -27,5 +27,6 @@
   input#__primary:checked ~ .bd-container .bd-sidebar-primary {
     margin-left: -$leftbar-width-wide;
     visibility: hidden;
+    opacity: 0;
   }
 }

From cf14d580c4f38c1d1b9ddd70853eb4c96ee2237c Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 30 Nov 2022 00:28:24 +1100
Subject: [PATCH 32/65] code block margin and show-inpage-toc

---
 .../assets/styles/content/_margin.scss               |  4 ++++
 .../assets/styles/sections/_sidebar-secondary.scss   | 12 +++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index 2402c121..3609b91f 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -107,6 +107,8 @@ figure.margin,
 div.figure.margin-caption p.caption,
 div.figure.margin-caption figcaption,
 figure.margin-caption figcaption {
+  z-index: 2;
+  position: relative;
   @include margin-content();
 }
 
@@ -115,6 +117,8 @@ div.cell.tag_full-width,
 div.cell.tag_full_width,
 div.full_width,
 div.full-width {
+  z-index: 2;
+  position: relative;
   @media (min-width: $breakpoint-md) {
     max-width: $content-fullwidth-width;
     width: $content-fullwidth-width;
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 5d95ac8c..e9659493 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -10,6 +10,7 @@
       max-height: 0;
       overflow-y: hidden;
       margin-bottom: 0rem;
+      transition: opacity 0.4s ease, max-height 0.7s ease;
     }
 
     // Hide the arrow when we display the toc
@@ -42,6 +43,9 @@
     position: static; // .toc-item is made sticky so that z-index works well, for margin content
     max-height: unset;
     overflow-y: unset;
+    // Remove padding so that it's flush on the top and left
+    padding-top: 0;
+    padding-left: 0;
     .tocsection {
       padding: 0.5rem 1rem !important;
     }
@@ -67,9 +71,7 @@
   }
 
   // By default the nav is shown
-  nav {
-    @include show-inpage-toc();
-  }
+  @include show-inpage-toc;
 
   // Make sure the pydata sphinx theme edit button doesn't show up
   div.editthispage {
@@ -79,8 +81,4 @@
   div.sourcelink {
     display: none;
   }
-
-  // Remove padding so that it's flush on the top and left
-  padding-top: 0;
-  padding-left: 0;
 }

From b3ad1bae4ca12768e600a27a9eaf8f02cd56525b Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 30 Nov 2022 00:47:29 +1100
Subject: [PATCH 33/65] margin content pushes code cells down

---
 src/sphinx_book_theme/assets/styles/content/_code.scss | 5 +++++
 src/sphinx_book_theme/assets/styles/index.scss         | 1 +
 2 files changed, 6 insertions(+)
 create mode 100644 src/sphinx_book_theme/assets/styles/content/_code.scss

diff --git a/src/sphinx_book_theme/assets/styles/content/_code.scss b/src/sphinx_book_theme/assets/styles/content/_code.scss
new file mode 100644
index 00000000..b539f0e6
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/content/_code.scss
@@ -0,0 +1,5 @@
+// Over-ride Sphinx default so that content fills whitespace w/ margin content
+pre,
+div[class*="highlight-"] {
+  clear: none;
+}
diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index cd6f83fc..5ee23614 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -32,6 +32,7 @@
 @import "content/images";
 @import "content/margin";
 @import "content/quotes";
+@import "content/code";
 
 // Content blocks from Sphinx extensions
 

From 1f09856a2db7cb855ca61d26c21e32c594ffa5d4 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 30 Nov 2022 00:58:31 +1100
Subject: [PATCH 34/65] output tag style

---
 src/sphinx_book_theme/assets/styles/content/_code.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/content/_code.scss b/src/sphinx_book_theme/assets/styles/content/_code.scss
index b539f0e6..169b309e 100644
--- a/src/sphinx_book_theme/assets/styles/content/_code.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_code.scss
@@ -3,3 +3,9 @@ pre,
 div[class*="highlight-"] {
   clear: none;
 }
+
+div.cell.tag_output_scroll div.cell_output,
+div.cell.tag_scroll-output div.cell_output {
+  max-height: 24em;
+  overflow-y: auto;
+}

From 6cbf04414403ef68b87b682a97699a4c98edab03 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 30 Nov 2022 01:09:37 +1100
Subject: [PATCH 35/65] announcemnet color

---
 src/sphinx_book_theme/assets/styles/abstracts/_variables.scss | 2 ++
 src/sphinx_book_theme/assets/styles/index.scss                | 1 +
 .../assets/styles/sections/_announcement.scss                 | 4 ++++
 3 files changed, 7 insertions(+)
 create mode 100644 src/sphinx_book_theme/assets/styles/sections/_announcement.scss

diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
index c70e7b7c..2fce2627 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
@@ -38,6 +38,8 @@ html {
 // See https://github.com/pydata/pydata-sphinx-theme/blob/master/pydata_sphinx_theme/static/css/theme.css
 html[data-theme="light"] {
   --pst-color-primary: rgb(87, 154, 202);
+  // Announcement
+  --sbt-color-announcement: rgb(97, 97, 97);
 }
 
 html[data-theme="dark"] {
diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index 5ee23614..cbdd52b1 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -16,6 +16,7 @@
 @import "base/print";
 
 // Major theme layout, skeleton, and whitespace
+@import "sections/announcement";
 @import "sections/article";
 @import "sections/article-container";
 @import "sections/header-article";
diff --git a/src/sphinx_book_theme/assets/styles/sections/_announcement.scss b/src/sphinx_book_theme/assets/styles/sections/_announcement.scss
new file mode 100644
index 00000000..5ff068f9
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/sections/_announcement.scss
@@ -0,0 +1,4 @@
+.bd-header-announcement {
+  background-color: var(--sbt-color-announcement);
+  color: #fff;
+}

From 3cff9054ccde1ab5e107eb80ba02be61d8babdab Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 30 Nov 2022 23:14:23 +1100
Subject: [PATCH 36/65] search page style

---
 src/sphinx_book_theme/assets/styles/components/_search.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/components/_search.scss b/src/sphinx_book_theme/assets/styles/components/_search.scss
index cc3ec024..96c7c335 100644
--- a/src/sphinx_book_theme/assets/styles/components/_search.scss
+++ b/src/sphinx_book_theme/assets/styles/components/_search.scss
@@ -1,8 +1,14 @@
 .bd-search-container {
   margin: 2em;
+  h1:first-child {
+    display: none;
+  }
   #search-results {
     h2:first-child {
       display: none;
     }
   }
+  .bd-search {
+    display: none !important;
+  }
 }

From 54eeebbe5e97ff652aad7d77408e20f2273790d8 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 30 Nov 2022 23:27:34 +1100
Subject: [PATCH 37/65] extension added for syntax highlighting

---
 docs/conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/conf.py b/docs/conf.py
index 57a0e8ca..21862639 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,6 +31,7 @@
     "sphinxext.opengraph",
     # For the kitchen sink
     "sphinx.ext.todo",
+    "IPython.sphinxext.ipython_console_highlighting",
 ]
 
 # Add any paths that contain templates here, relative to this directory.

From 992edc2ac826b7b8272d08a41758c0e8edde0a50 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 1 Dec 2022 00:01:44 +1100
Subject: [PATCH 38/65] Update
 src/sphinx_book_theme/assets/styles/components/_search.scss

Co-authored-by: Chris Holdgraf <choldgraf@gmail.com>
---
 src/sphinx_book_theme/assets/styles/components/_search.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/sphinx_book_theme/assets/styles/components/_search.scss b/src/sphinx_book_theme/assets/styles/components/_search.scss
index 96c7c335..eaae68b4 100644
--- a/src/sphinx_book_theme/assets/styles/components/_search.scss
+++ b/src/sphinx_book_theme/assets/styles/components/_search.scss
@@ -1,5 +1,6 @@
 .bd-search-container {
   margin: 2em;
+  // Remove the search field on the search page since we have one in the sidebar
   h1:first-child {
     display: none;
   }

From 10d28f0bd6cd52bc34efa4362e0b22395a53ce65 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 1 Dec 2022 00:30:27 +1100
Subject: [PATCH 39/65] ipython version

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 73f7f349..1a8bf251 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -75,7 +75,8 @@ test = [
     "pytest~=7.1",
     "pytest-cov>=3,<5",
     "pytest-regressions>=2.0.1,<2.5.0",
-    "sphinx_thebe"
+    "sphinx_thebe",
+    "ipython==8.6.0"
 ]
 
 [project.entry-points]

From a3d7c7c64984daaf66f6e3b4cabf48c71723d884 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 1 Dec 2022 00:34:13 +1100
Subject: [PATCH 40/65] checking if ipython version is the issue

---
 .github/workflows/tests.yml | 1 +
 pyproject.toml              | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index afceaa86..6de2c79a 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,6 +50,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install -e .[test]
+        python -m pip install ipython==8.6.0
 
     - name: Run pytest
       run: >
diff --git a/pyproject.toml b/pyproject.toml
index 1a8bf251..27f8f847 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -76,7 +76,6 @@ test = [
     "pytest-cov>=3,<5",
     "pytest-regressions>=2.0.1,<2.5.0",
     "sphinx_thebe",
-    "ipython==8.6.0"
 ]
 
 [project.entry-points]

From c9f8a28c2d1149d84a76e26de6724f596c9f0689 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 1 Dec 2022 00:40:08 +1100
Subject: [PATCH 41/65] removing pygments_lexer metadata in test file

---
 .github/workflows/tests.yml          | 1 -
 tests/sites/base/section1/ntbk.ipynb | 1 -
 2 files changed, 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 6de2c79a..afceaa86 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -50,7 +50,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install -e .[test]
-        python -m pip install ipython==8.6.0
 
     - name: Run pytest
       run: >
diff --git a/tests/sites/base/section1/ntbk.ipynb b/tests/sites/base/section1/ntbk.ipynb
index bee4eb63..cebfdbb6 100644
--- a/tests/sites/base/section1/ntbk.ipynb
+++ b/tests/sites/base/section1/ntbk.ipynb
@@ -40,7 +40,6 @@
    "mimetype": "text/x-python",
    "name": "python",
    "nbconvert_exporter": "python",
-   "pygments_lexer": "ipython3",
    "version": "3.8.0"
   }
  },

From 3e9b91bba6a60da56e2da14631c6eb661c16d079 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 1 Dec 2022 00:55:33 +1100
Subject: [PATCH 42/65] jupyter logo

---
 docs/reference/special-theme-elements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/special-theme-elements.md b/docs/reference/special-theme-elements.md
index 697fe140..c7513793 100644
--- a/docs/reference/special-theme-elements.md
+++ b/docs/reference/special-theme-elements.md
@@ -65,7 +65,7 @@ This is some markdown that should be shown at full width.
 
 Here's the Jupyter logo:
 
-![](https://raw.githubusercontent.com/adebar/awesome-jupyter/master/logo.png)
+![](https://github.com/markusschanta/awesome-jupyter/blob/master/assets/logo.png)
 
 :::{note}
 Here's a full-width admonition!

From 091e234c11584fb93d3065152b98617005654b62 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Thu, 1 Dec 2022 00:59:53 +1100
Subject: [PATCH 43/65] logo img link

---
 docs/reference/special-theme-elements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/special-theme-elements.md b/docs/reference/special-theme-elements.md
index c7513793..77cc2234 100644
--- a/docs/reference/special-theme-elements.md
+++ b/docs/reference/special-theme-elements.md
@@ -65,7 +65,7 @@ This is some markdown that should be shown at full width.
 
 Here's the Jupyter logo:
 
-![](https://github.com/markusschanta/awesome-jupyter/blob/master/assets/logo.png)
+![](https://raw.githubusercontent.com/markusschanta/awesome-jupyter/master/assets/logo.png)
 
 :::{note}
 Here's a full-width admonition!

From 7b1c7176c50de8940a2479049f2dc22cea56c823 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 5 Dec 2022 09:38:47 +1100
Subject: [PATCH 44/65] adding deprecation for single page

---
 docs/conf.py                      |  1 -
 src/sphinx_book_theme/__init__.py | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 21862639..57a0e8ca 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,6 @@
     "sphinxext.opengraph",
     # For the kitchen sink
     "sphinx.ext.todo",
-    "IPython.sphinxext.ipython_console_highlighting",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index fff2c2be..d70a60d4 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -19,6 +19,7 @@
 """sphinx-book-theme version"""
 
 SPHINX_LOGGER = logging.getLogger(__name__)
+DEFAULT_LOG_TYPE = "sphinxbooktheme"
 MESSAGE_CATALOG_NAME = "booktheme"
 
 
@@ -151,6 +152,19 @@ def update_mode_thebe_config(app):
     app.config.html_context["default_mode"] = "light"
 
 
+def check_deprecation_keys(app):
+    """Warns about the deprecated keys."""
+
+    deprecated_config_list = ["single_page"]
+    for key in deprecated_config_list:
+        if key in app.env.config.html_theme_options:
+            SPHINX_LOGGER.info(
+                f"'{key}' was deprecated for version >= 0.3.4. "
+                f"[{DEFAULT_LOG_TYPE}]",
+                type=DEFAULT_LOG_TYPE,
+            )
+
+
 class Margin(Sidebar):
     """Goes in the margin to the right of the page."""
 
@@ -214,6 +228,7 @@ def setup(app: Sphinx):
 
     # Events
     app.connect("builder-inited", update_mode_thebe_config)
+    app.connect("builder-inited", check_deprecation_keys)
     app.connect("config-inited", update_general_config)
     app.connect("html-page-context", add_metadata_to_page)
     app.connect("html-page-context", hash_html_assets)

From c2b4bc4e98928f07297d17bc522a988a05950e62 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 5 Dec 2022 09:40:02 +1100
Subject: [PATCH 45/65] adding deprecation for single page

---
 src/sphinx_book_theme/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index d70a60d4..923a246d 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -159,7 +159,7 @@ def check_deprecation_keys(app):
     for key in deprecated_config_list:
         if key in app.env.config.html_theme_options:
             SPHINX_LOGGER.info(
-                f"'{key}' was deprecated for version >= 0.3.4. "
+                f"'{key}' was deprecated from version 0.3.4. Please see the CHANGELOG for more information."  # noqa: E501
                 f"[{DEFAULT_LOG_TYPE}]",
                 type=DEFAULT_LOG_TYPE,
             )

From 41422186d3c837b5926302df1e0439e2851ebc06 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 5 Dec 2022 11:35:57 +1100
Subject: [PATCH 46/65] removing border bottom for margins

---
 src/sphinx_book_theme/assets/styles/content/_margin.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index 3609b91f..f0bfa21c 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -32,7 +32,8 @@ $content-fullwidth-width: percentage(100% / $content-max-width);
     clear: right; // Prevent sequential margin content from overlapping
 
     p.sidebar-title {
-      margin-bottom: 0.1em;
+      margin-bottom: -1rem;
+      border-bottom: none;
     }
   }
 }

From f2549f56926d9a02244c93805f85186c2e3864da Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 6 Dec 2022 15:57:01 +1100
Subject: [PATCH 47/65] margin and sidebar styles

---
 .../assets/styles/content/_margin.scss        | 24 ++++++++++++++++++-
 .../assets/styles/index.scss                  |  1 +
 .../styles/sections/_footer-article.scss      |  3 +++
 3 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 src/sphinx_book_theme/assets/styles/sections/_footer-article.scss

diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index f0bfa21c..1e99251a 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -34,6 +34,10 @@ $content-fullwidth-width: percentage(100% / $content-max-width);
     p.sidebar-title {
       margin-bottom: -1rem;
       border-bottom: none;
+      padding-left: 0px;
+      ~ * {
+        padding-left: 0px;
+      }
     }
   }
 }
@@ -89,9 +93,27 @@ span.marginnote {
   }
 }
 
+aside.sidebar {
+  .note {
+    // styling for notes inside sidebars
+    margin: 1rem;
+    padding: 0rem 0rem 1rem 0rem;
+  }
+  // The titles sticking
+  .admonition-title {
+    margin: 0rem -1rem 0rem 0rem;
+  }
+}
+
+aside.sidebar.margin {
+  .note {
+    margin: 1rem 0rem;
+  }
+}
+
 div.margin,
-aside.margin,
 figure.margin,
+aside.margin,
 .cell.tag_popout,
 .cell.tag_margin {
   z-index: 2;
diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index cbdd52b1..2d9e7d93 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -24,6 +24,7 @@
 @import "sections/sidebar-primary";
 @import "sections/sidebar-secondary";
 @import "sections/footer-content";
+@import "sections/footer-article";
 
 // Re-usable components across the theme
 @import "components/buttons";
diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-article.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-article.scss
new file mode 100644
index 00000000..1d2e412e
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/sections/_footer-article.scss
@@ -0,0 +1,3 @@
+.bd-footer-article {
+  padding: 0rem 1rem;
+}

From c7b6cc7a1d3559cde6f2466153b2906bf758494f Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 7 Dec 2022 12:18:44 +1100
Subject: [PATCH 48/65] font sizes for primary sidebar

---
 src/sphinx_book_theme/__init__.py                             | 4 ++--
 src/sphinx_book_theme/assets/styles/abstracts/_variables.scss | 3 +++
 .../assets/styles/sections/_footer-content.scss               | 1 +
 .../assets/styles/sections/_sidebar-primary.scss              | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index 923a246d..64366d2f 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -158,8 +158,8 @@ def check_deprecation_keys(app):
     deprecated_config_list = ["single_page"]
     for key in deprecated_config_list:
         if key in app.env.config.html_theme_options:
-            SPHINX_LOGGER.info(
-                f"'{key}' was deprecated from version 0.3.4. Please see the CHANGELOG for more information."  # noqa: E501
+            SPHINX_LOGGER.warning(
+                f"'{key}' was deprecated from version 0.3.4 onwards. Please see the CHANGELOG for more information."  # noqa: E501
                 f"[{DEFAULT_LOG_TYPE}]",
                 type=DEFAULT_LOG_TYPE,
             )
diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
index 2fce2627..c4aede4f 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
@@ -25,6 +25,9 @@ $box-border-radius: 0.4em;
 
 $animation-time: 0.25s;
 
+// Font sizes
+$sbt-font-size-small-1: 87.5%;
+
 /**
  * Variables that aren't impacted by light/dark
  */
diff --git a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
index 52a55d5e..067b020b 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_footer-content.scss
@@ -8,6 +8,7 @@ footer {
     flex-wrap: wrap;
     padding: 15px;
     border-top: 1px solid #ccc;
+    font-size: $sbt-font-size-small-1;
     .bd-footer-content__inner {
       padding-left: 0px;
       p {
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index 9df15e27..d955b659 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -5,7 +5,8 @@
 .bd-sidebar-primary {
   transition: margin-left $animation-time ease 0s,
     opacity $animation-time ease 0s, visibility $animation-time ease 0s;
-
+  flex: 0 0 20%;
+  font-size: $sbt-font-size-small-1;
   .navbar-brand {
     height: unset;
   }

From ddd4f7e7574a6d114339177a662f9c450c96bfee Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 7 Dec 2022 12:21:33 +1100
Subject: [PATCH 49/65] relaxing lighthouse score

---
 .github/workflows/lighthouserc.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/lighthouserc.json b/.github/workflows/lighthouserc.json
index a40703d6..495f3d93 100644
--- a/.github/workflows/lighthouserc.json
+++ b/.github/workflows/lighthouserc.json
@@ -9,9 +9,9 @@
     },
     "assert": {
       "assertions": {
-        "categories:performance": ["error", { "minScore": 0.85 }],
-        "categories:accessibility": ["error", { "minScore": 0.85 }],
-        "categories:best-practices": ["error", { "minScore": 0.85 }]
+        "categories:performance": ["error", { "minScore": 0.84 }],
+        "categories:accessibility": ["error", { "minScore": 0.84 }],
+        "categories:best-practices": ["error", { "minScore": 0.84 }]
       }
     }
   }

From e53809fd7c445fa9afc04070101029ef629bb0b7 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 7 Dec 2022 23:26:37 +1100
Subject: [PATCH 50/65] scrollbar mixin and animation

---
 .../assets/styles/abstracts/_mixins.scss      | 29 +++++++++++++++++++
 .../assets/styles/content/_code.scss          |  4 +++
 .../styles/sections/_sidebar-secondary.scss   |  6 ++--
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss b/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
index d43358ee..dec7f9c1 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
@@ -1,6 +1,35 @@
 /*********************************************
 * SASS Mixins
 *********************************************/
+/**
+* Scrollbars should be thinner and slightly rounded, with a grey background
+*/
+@mixin scrollbar-style() {
+  &::-webkit-scrollbar {
+    width: 0.3rem;
+    height: 0.3rem;
+  }
+
+  &::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 0.25rem;
+
+    &:hover {
+      background: #a0a0a0;
+    }
+  }
+}
+
+/**
+* Hide the scrollbar until the element is overed, so keep the page clean
+*/
+@mixin scrollbar-on-hover() {
+  &:not(:hover) {
+    &::-webkit-scrollbar-thumb {
+      visibility: hidden;
+    }
+  }
+}
 
 /**
  * Header behavior on mobile
diff --git a/src/sphinx_book_theme/assets/styles/content/_code.scss b/src/sphinx_book_theme/assets/styles/content/_code.scss
index 169b309e..14ce6a2d 100644
--- a/src/sphinx_book_theme/assets/styles/content/_code.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_code.scss
@@ -4,6 +4,10 @@ div[class*="highlight-"] {
   clear: none;
 }
 
+pre {
+  @include scrollbar-style();
+}
+
 div.cell.tag_output_scroll div.cell_output,
 div.cell.tag_scroll-output div.cell_output {
   max-height: 24em;
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index e9659493..09ea44d2 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -10,7 +10,7 @@
       max-height: 0;
       overflow-y: hidden;
       margin-bottom: 0rem;
-      transition: opacity 0.4s ease, max-height 0.7s ease;
+      transition: opacity 0.4s ease, max-height 0.4s ease;
     }
 
     // Hide the arrow when we display the toc
@@ -35,7 +35,9 @@
       opacity: 1;
       overflow-y: auto;
       background: white;
-      transition: opacity 0.4s ease, max-height 0.7s ease;
+      transition: opacity 0.4s ease, max-height 0.4s ease;
+      @include scrollbar-style();
+      @include scrollbar-on-hover();
     }
   }
 

From b9fd52d90f8ac7b7608de2eac8198f3814d33fca Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 14 Dec 2022 11:34:39 +1100
Subject: [PATCH 51/65] responsive css and nav scroll attempt

---
 .../assets/styles/abstracts/_variables.scss   |  2 +-
 .../styles/sections/_sidebar-primary.scss     |  2 +-
 .../styles/sections/_sidebar-secondary.scss   | 37 +++++++++++++------
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
index c4aede4f..67af4d7a 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
@@ -15,7 +15,7 @@ $zindex-offcanvas: 1100; // We increase this to be over the tooltips
 // Spacing
 $header-article-height: 3em;
 $leftbar-width-mobile: 75%;
-$leftbar-width-wide: 275px;
+$leftbar-width-wide: 20%;
 $toc-width-mobile: 75%;
 // Main content, to leave room for the margin
 $content-max-width: 75%;
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index d955b659..393f63fd 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -24,7 +24,7 @@
 
 // Default visibility for left sidebar is the reverse of what it is on mobile.
 // Mobile behavior is defined in the pydata sphinx theme
-@media (min-width: 960px) {
+@media (min-width: $breakpoint-md) {
   input#__primary:checked ~ .bd-container .bd-sidebar-primary {
     margin-left: -$leftbar-width-wide;
     visibility: hidden;
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 09ea44d2..2bc7c24b 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -36,11 +36,27 @@
       overflow-y: auto;
       background: white;
       transition: opacity 0.4s ease, max-height 0.4s ease;
-      @include scrollbar-style();
-      @include scrollbar-on-hover();
     }
   }
 
+  // By default the nav is shown
+  @include show-inpage-toc;
+
+  // scrollbar styles
+  nav {
+    @include scrollbar-style();
+    @include scrollbar-on-hover();
+  }
+
+  // Make sure the pydata sphinx theme edit button doesn't show up
+  div.editthispage {
+    display: none;
+  }
+
+  div.sourcelink {
+    display: none;
+  }
+
   @media (min-width: $breakpoint-md) {
     position: static; // .toc-item is made sticky so that z-index works well, for margin content
     max-height: unset;
@@ -72,15 +88,12 @@
     }
   }
 
-  // By default the nav is shown
-  @include show-inpage-toc;
-
-  // Make sure the pydata sphinx theme edit button doesn't show up
-  div.editthispage {
-    display: none;
-  }
-
-  div.sourcelink {
-    display: none;
+  @media (min-width: $breakpoint-md) and (max-width: $breakpoint-xl) {
+    margin-right: 0px;
+    flex-basis: 25%;
+    visibility: visible;
+    z-index: 1;
+    height: auto;
+    font-size: 100%;
   }
 }

From 249691b87d39040537b11dd5aadf2b3f355d8654 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 14 Dec 2022 10:08:17 +0100
Subject: [PATCH 52/65] Remove buttons and responsive behavior fixes

---
 src/sphinx_book_theme/__init__.py             |   2 +-
 src/sphinx_book_theme/_transforms.py          |   3 +-
 .../assets/styles/abstracts/_mixins.scss      |  31 +----
 .../assets/styles/abstracts/_variables.scss   |  12 +-
 .../assets/styles/components/_buttons.scss    | 105 -----------------
 .../assets/styles/content/_code.scss          |  10 --
 .../assets/styles/content/_margin.scss        |  59 ++++++----
 .../assets/styles/content/_notebooks.scss     |   6 +
 .../assets/styles/index.scss                  |   2 +-
 .../styles/sections/_header-article.scss      |  85 +++++++++++++-
 .../styles/sections/_sidebar-primary.scss     |  17 ++-
 .../styles/sections/_sidebar-secondary.scss   | 107 +++++++-----------
 .../sphinx_book_theme/macros/buttons.html     |  42 +++----
 .../sections/header-article.html              |  10 +-
 14 files changed, 216 insertions(+), 275 deletions(-)
 delete mode 100644 src/sphinx_book_theme/assets/styles/components/_buttons.scss
 create mode 100644 src/sphinx_book_theme/assets/styles/content/_notebooks.scss

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index 64366d2f..3d265029 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -60,7 +60,7 @@ def add_metadata_to_page(app, pagename, templatename, context, doctree):
     context["translate"] = translation
     # this is set in the html_theme
     context["theme_search_bar_text"] = translation(
-        context.get("theme_search_bar_text", "Search the docs ...")
+        context.get("theme_search_bar_text", "Search...")
     )
 
 
diff --git a/src/sphinx_book_theme/_transforms.py b/src/sphinx_book_theme/_transforms.py
index f97aee6f..d30c8e3d 100644
--- a/src/sphinx_book_theme/_transforms.py
+++ b/src/sphinx_book_theme/_transforms.py
@@ -3,7 +3,6 @@
 from docutils import nodes as docutil_nodes
 from sphinx import addnodes as sphinx_nodes
 from .nodes import SideNoteNode
-import copy
 
 
 class HandleFootnoteTransform(SphinxPostTransform):
@@ -64,7 +63,7 @@ def run(self, **kwargs: Any) -> None:
                     # so it works w/ margin. Only show one or another depending on
                     # screen width.
                     node_parent = ref_node.parent
-                    para_dup = copy.deepcopy(para)
+                    para_dup = para.deepcopy()
                     # looping to check parent node
                     while not isinstance(
                         node_parent, (docutil_nodes.section, sphinx_nodes.document)
diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss b/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
index dec7f9c1..c93f19c0 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_mixins.scss
@@ -2,26 +2,8 @@
 * SASS Mixins
 *********************************************/
 /**
-* Scrollbars should be thinner and slightly rounded, with a grey background
-*/
-@mixin scrollbar-style() {
-  &::-webkit-scrollbar {
-    width: 0.3rem;
-    height: 0.3rem;
-  }
-
-  &::-webkit-scrollbar-thumb {
-    background: #c1c1c1;
-    border-radius: 0.25rem;
-
-    &:hover {
-      background: #a0a0a0;
-    }
-  }
-}
-
-/**
-* Hide the scrollbar until the element is overed, so keep the page clean
+* Hide the scrollbar until the element is hovered, so keep the page clean
+* Use this sparingly because it's not a great UX pattern.
 */
 @mixin scrollbar-on-hover() {
   &:not(:hover) {
@@ -30,12 +12,3 @@
     }
   }
 }
-
-/**
- * Header behavior on mobile
- */
-@mixin header-height-mobile {
-  @media (max-width: $breakpoint-md) {
-    height: $header-article-height + 0.75em;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
index c4aede4f..6bf531b8 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
@@ -12,11 +12,15 @@ $breakpoint-sm: 576px;
 $zindex-sticky: 1020;
 $zindex-offcanvas: 1100; // We increase this to be over the tooltips
 
+// A few semantic z-indices
+$zindex-bottom: 1;
+$zindex-middle: 2;
+$zindex-top: 3;
+
 // Spacing
-$header-article-height: 3em;
-$leftbar-width-mobile: 75%;
-$leftbar-width-wide: 275px;
-$toc-width-mobile: 75%;
+$header-article-height: 3rem;
+$sidebar-primary-width-widescreen: 275px;
+
 // Main content, to leave room for the margin
 $content-max-width: 75%;
 
diff --git a/src/sphinx_book_theme/assets/styles/components/_buttons.scss b/src/sphinx_book_theme/assets/styles/components/_buttons.scss
deleted file mode 100644
index 78e16225..00000000
--- a/src/sphinx_book_theme/assets/styles/components/_buttons.scss
+++ /dev/null
@@ -1,105 +0,0 @@
-/*********************************************
-* Buttons, mostly for the headers            *
-*********************************************/
-/**
- * Basic button style
- */
-.headerbtn {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  // Color should be more muted than pydata theme
-  color: var(--pst-color-text-muted);
-  &:hover {
-    color: var(--pst-color-text-base);
-    text-decoration: none;
-  }
-  background-color: var(--pst-color-background);
-  cursor: pointer;
-
-  border: none;
-  padding: 0.1rem 0.5rem; // Horizontal padding since labels have none
-  margin: 0 0.1rem;
-
-  span {
-    display: flex;
-    align-items: center;
-  }
-
-  // Icons and image icons
-  img,
-  i {
-    margin: auto;
-    width: 1em;
-    text-align: center;
-    font-size: 1.5em; // Slightly larger for icons
-  }
-}
-
-/**
- * Dropdown groups of buttons
- */
-.menu-dropdown__trigger:hover + .menu-dropdown__content,
-.menu-dropdown__content:hover {
-  visibility: visible;
-  opacity: 1;
-}
-
-.menu-dropdown__content {
-  // Hide by default, we'll show on hover
-  position: absolute;
-  visibility: hidden;
-  opacity: 0;
-  transform: translateX(-75%);
-  transition: opacity 0.2s ease-out;
-
-  // Spacing and position
-  width: 10rem;
-  border-radius: $box-border-radius;
-  box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.25);
-  padding: 0.5em;
-
-  // Style
-  background-color: var(--pst-color-background);
-
-  .headerbtn {
-    justify-content: left;
-    padding: 0.1rem 0rem;
-  }
-
-  ul {
-    list-style: none;
-    padding-left: 0;
-    margin-bottom: 0;
-  }
-
-  span {
-    display: flex;
-
-    &.headerbtn__icon-container {
-      width: 2em;
-    }
-
-    &.headerbtn__text-container {
-      flex-grow: 1;
-      margin-left: 0.5em;
-    }
-  }
-
-  i,
-  img {
-    font-size: 1.2em; // Slightly smaller icons in a dropdown
-  }
-}
-
-/**
- * In-page table of contents
- */
-.headerbtn-secondary {
-  // Hide the button on wide screens since we display the TOC.
-  display: block;
-  @media (min-width: $breakpoint-md) {
-    display: none;
-  }
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_code.scss b/src/sphinx_book_theme/assets/styles/content/_code.scss
index 14ce6a2d..b539f0e6 100644
--- a/src/sphinx_book_theme/assets/styles/content/_code.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_code.scss
@@ -3,13 +3,3 @@ pre,
 div[class*="highlight-"] {
   clear: none;
 }
-
-pre {
-  @include scrollbar-style();
-}
-
-div.cell.tag_output_scroll div.cell_output,
-div.cell.tag_scroll-output div.cell_output {
-  max-height: 24em;
-  overflow-y: auto;
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index 1e99251a..4ff08b33 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -1,4 +1,15 @@
-// Margin variables
+/**
+ * Margin content
+ * This is the area to the right of the main content
+ * normally covered by the in-page table of contents
+ * but if `.margin` classes are present, it shows up to the right in the margin
+ * and the in-page TOC is hidden.
+ * On narrow screens, margin content behaves like a sidebar
+ */ 
+
+/** 
+ * Variables
+ */
 // The % is relative to our parent container, which has width == max-width
 // full-width = 100% = content-max-width + margin-width
 // We must express margin-width as a percentage of max-width. So:
@@ -14,35 +25,43 @@ $content-margin-offset: (-$content-margin-width - $content-margin-gutter);
 // Express 100% in parent container in % units of the child container.
 $content-fullwidth-width: percentage(100% / $content-max-width);
 
-// Note: Need to add a few specifics for `tag_` because these won't have a parent `.sidebar` class
-// On narrow screens, margin content behaves like a sidebar
-
-// On wide screens, it "pops out" to the right margin
-
+/**
+ * This mixin will cause something to "pop out" to the margin on wide screens
+ */
 @mixin margin-content() {
   width: 40%;
   float: right;
   background-color: unset;
-  border-left: 1px #a4a6a7 solid;
+  border-left: 1px var(--pst-color-border) solid;
   font-size: 0.9em;
+  // This is the wide-screen behavior
   @media (min-width: $breakpoint-md) {
     border: none;
     width: $content-margin-width;
     margin: 0 $content-margin-offset 0 0;
-    clear: right; // Prevent sequential margin content from overlapping
+    // Prevent sequential margin content from overlapping
+    clear: right;
+    // Slight padding so that admonition shadows still show
+    padding-right: .25rem;
 
     p.sidebar-title {
       margin-bottom: -1rem;
       border-bottom: none;
       padding-left: 0px;
+
+      // Content of admonitions has fewer horizontal white space to save space
       ~ * {
         padding-left: 0px;
+        padding-right: 0px;
       }
     }
   }
 }
 
-// Sidenotes and marginnotes
+/**
+ * Sidenotes and marginnotes
+ * over-rides the "footnote" behavior to pop out to the margin instead.
+ */
 label.margin-toggle {
   margin-bottom: 0em;
   &.marginnote-label {
@@ -81,7 +100,7 @@ input.margin-toggle {
 
 span.sidenote,
 span.marginnote {
-  z-index: 2;
+  z-index: $zindex-middle;
   position: relative;
   sup {
     user-select: none;
@@ -116,7 +135,7 @@ figure.margin,
 aside.margin,
 .cell.tag_popout,
 .cell.tag_margin {
-  z-index: 2;
+  z-index: $zindex-middle;
   position: relative;
   @include margin-content();
 
@@ -130,25 +149,27 @@ aside.margin,
 div.figure.margin-caption p.caption,
 div.figure.margin-caption figcaption,
 figure.margin-caption figcaption {
-  z-index: 2;
+  z-index: $zindex-middle;
   position: relative;
   @include margin-content();
 }
 
-// Full-width content
+// Margin captions
+.margin-caption figcaption {
+  text-align: left;
+}
+
+/**
+ * Full width content
+ */
 div.cell.tag_full-width,
 div.cell.tag_full_width,
 div.full_width,
 div.full-width {
-  z-index: 2;
+  z-index: $zindex-middle;
   position: relative;
   @media (min-width: $breakpoint-md) {
     max-width: $content-fullwidth-width;
     width: $content-fullwidth-width;
   }
 }
-
-// Margin captions
-.margin-caption figcaption {
-  text-align: left;
-}
diff --git a/src/sphinx_book_theme/assets/styles/content/_notebooks.scss b/src/sphinx_book_theme/assets/styles/content/_notebooks.scss
new file mode 100644
index 00000000..4ac5ad02
--- /dev/null
+++ b/src/sphinx_book_theme/assets/styles/content/_notebooks.scss
@@ -0,0 +1,6 @@
+// MyST-NB and Jupyter Notebooks
+div.cell.tag_output_scroll div.cell_output,
+div.cell.tag_scroll-output div.cell_output {
+  max-height: 24em;
+  overflow-y: auto;
+}
\ No newline at end of file
diff --git a/src/sphinx_book_theme/assets/styles/index.scss b/src/sphinx_book_theme/assets/styles/index.scss
index 2d9e7d93..ab7be4b2 100644
--- a/src/sphinx_book_theme/assets/styles/index.scss
+++ b/src/sphinx_book_theme/assets/styles/index.scss
@@ -27,7 +27,6 @@
 @import "sections/footer-article";
 
 // Re-usable components across the theme
-@import "components/buttons";
 @import "components/search";
 
 // Content blocks in standard Sphinx
@@ -35,6 +34,7 @@
 @import "content/margin";
 @import "content/quotes";
 @import "content/code";
+@import "content/notebooks";
 
 // Content blocks from Sphinx extensions
 
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index 1d828c02..c7b7907c 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -1,7 +1,33 @@
 /*********************************************
 * Top Bar *
-* TODO: Rename much of these to article-header to conform with sphinx-basic-ng
 *********************************************/
+/**
+ * Mixin:
+ * Header behavior on mobile
+ */
+ @mixin header-height-mobile {
+  @media (max-width: $breakpoint-md) {
+    height: $header-article-height + 0.75rem;
+  }
+}
+
+/**
+ * Sidebar toggle over-rides for PST
+ */
+// Primary toggle is always visible
+label.sidebar-toggle.primary-toggle {
+  @media (min-width: $breakpoint-md) {
+    display: inline-block;
+  }
+}
+
+// Secondary toggle mimics behavior of "persistent header" div of PST
+label.sidebar-toggle.secondary-toggle {
+  @media (min-width: $breakpoint-lg) {
+    display: none;
+  }
+}
+
 // Wrapper container
 .bd-header-article {
   height: $header-article-height; // Fix the height so the TOC doesn't grow it
@@ -16,7 +42,7 @@
   @include header-height-mobile;
 
   .scrolled & {
-    box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 6px 6px -6px var(--pst-color-shadow);
   }
 
   // Inner container with content
@@ -36,3 +62,58 @@
     }
   }
 }
+
+/**
+ * Buttons in the header
+ */
+div.header-article-main {
+  .btn {
+    // Basic button size
+    font-size: 1.3rem;
+    color: var(--pst-color-text-muted);
+    border: none;
+
+    // Hover / active behavior
+    &.show,&:hover,&:focus,&:active {
+      color: var(--pst-color-text-base);
+      border: none;
+    }
+
+    &.dropdown-toggle {      
+      // Hide the bootstrap caret
+      &:after {
+        display: none;
+      }
+    }
+  }
+
+  // The menu that is normally hidden until you click
+  .dropdown-menu {
+    // Positioning and layout of dropdown items to be standardized
+    .dropdown-item {
+      display: inline-flex;
+      align-items: center;
+      padding-left: .5em;
+
+      // To prevent link underline from showing up
+      &:hover {
+        text-decoration: none;
+      }
+
+      // Slightly smaller font for everything
+      font-size: 1em;
+      
+      // Image icons should be the same height as <i> icons
+      span img {
+        height: 1em;
+      }
+
+      span.btn__icon-container {
+        width: 1.7em;
+        align-items: center;
+        display: inline-flex;
+        justify-content: center;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index d955b659..840e7e0d 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -5,8 +5,8 @@
 .bd-sidebar-primary {
   transition: margin-left $animation-time ease 0s,
     opacity $animation-time ease 0s, visibility $animation-time ease 0s;
-  flex: 0 0 20%;
   font-size: $sbt-font-size-small-1;
+
   .navbar-brand {
     height: unset;
   }
@@ -20,14 +20,19 @@
   .sidebar-start-items {
     border-top: none;
   }
+
+  // On wide screens we have a smaller sidebar width than PST
+  @media (min-width: $breakpoint-md) {
+    width: $sidebar-primary-width-widescreen;
+  }
 }
 
-// Default visibility for left sidebar is the reverse of what it is on mobile.
-// Mobile behavior is defined in the pydata sphinx theme
-@media (min-width: 960px) {
+@media (min-width: $breakpoint-md) {
+  // Default visibility for left sidebar is the reverse of what it is on mobile.
+  // Mobile behavior is defined in the pydata sphinx theme
   input#__primary:checked ~ .bd-container .bd-sidebar-primary {
-    margin-left: -$leftbar-width-wide;
+    margin-left: -$sidebar-primary-width-widescreen;
     visibility: hidden;
     opacity: 0;
   }
-}
+}
\ No newline at end of file
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 09ea44d2..0ceb3cae 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -3,84 +3,61 @@
 *********************************************/
 
 .bd-sidebar-secondary {
-  // Show / hide the in-page TOC items
-  @mixin hide-inpage-toc {
-    nav {
-      opacity: 1;
-      max-height: 0;
-      overflow-y: hidden;
-      margin-bottom: 0rem;
-      transition: opacity 0.4s ease, max-height 0.4s ease;
+  // Wide screen behavior
+  @media (min-width: $breakpoint-md) {
+    background: var(--pst-color-background);
+    transition: max-height 0.4s ease;
+
+    // To make sure it shows above the page content
+    z-index: $zindex-middle;
+
+    // Remove padding so that it's flush on the top and left
+    padding: 0;
+
+    // This is the container div for the secondary sidebar nav
+    .toc-item {
+      // Flush with the top so that we can fix the height of the toc header div
+      padding-top: 0;
+
+      // The 'on this page' title should take up the full header
+      .onthispage {
+        height: $header-article-height;
+        display: flex;
+        align-items: center;
+
+        // Items after "on this page' should fade in and out
+        + * {
+          transition: opacity 0.4s ease;
+        }
+      }
     }
 
-    // Hide the arrow when we display the toc
-    .tocsection {
+    // Rules for when sidebar is hidden
+    // the `not:hover` means that hovering over the sidebar will show it again.
+    &.hide:not(:hover) {
+      // Cap the height, and remove the scrollbar
+      max-height: $header-article-height;
+      overflow-y: hidden;
+
+      // Shadow matches what we have in the article header
       .scrolled & {
         box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
       }
-      &:after {
+
+      // Show a down carot when the sidebar is hidden
+      .onthispage:after {
         opacity: 1;
         content: "\f107";
         font-family: "Font Awesome 5 Free";
         font-weight: 900;
         padding-left: 0.5em;
         transition: opacity 0.3s ease;
-      }
-    }
-  }
 
-  @mixin show-inpage-toc {
-    nav {
-      max-height: 90vh;
-      opacity: 1;
-      overflow-y: auto;
-      background: white;
-      transition: opacity 0.4s ease, max-height 0.4s ease;
-      @include scrollbar-style();
-      @include scrollbar-on-hover();
-    }
-  }
-
-  @media (min-width: $breakpoint-md) {
-    position: static; // .toc-item is made sticky so that z-index works well, for margin content
-    max-height: unset;
-    overflow-y: unset;
-    // Remove padding so that it's flush on the top and left
-    padding-top: 0;
-    padding-left: 0;
-    .tocsection {
-      padding: 0.5rem 1rem !important;
-    }
-    .toc-item {
-      padding: 0rem;
-      position: sticky; // this is made sticky so that z-index works well, for margin content
-      z-index: 3;
-      top: 0;
-      height: auto;
-      background: white;
-      // On wide screens, show the TOC with hover or w/ a show class
-      &:hover {
-        @include show-inpage-toc;
+        // All subsequent elements are invisible when hidden
+        + * {
+          opacity: 0;
+        }
       }
     }
-    a.nav-link {
-      margin-left: 0rem;
-    }
-
-    &.hide {
-      @include hide-inpage-toc;
-    }
-  }
-
-  // By default the nav is shown
-  @include show-inpage-toc;
-
-  // Make sure the pydata sphinx theme edit button doesn't show up
-  div.editthispage {
-    display: none;
-  }
-
-  div.sourcelink {
-    display: none;
   }
 }
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html b/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
index 02957594..d908cf3d 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
@@ -9,7 +9,7 @@
 {% macro render_inner_html(icon, text) %}
 {# used across multiple button types #}
 {% if icon -%}
-<span class="headerbtn__icon-container">
+<span class="btn__icon-container">
   {% if icon.startswith("fa") -%}
     <i class="{{ icon }}"></i>
   {% else %}
@@ -17,13 +17,13 @@
   {% endif -%}
 </span>
 {% endif %}
-{%- if text %}<span class="headerbtn__text-container">{{ translate(text) }}</span>{% endif -%}
+{%- if text %}<span class="btn__text-container">{{ translate(text) }}</span>{% endif -%}
 {% endmacro %}
 
 
-{% macro render_link_button(url, tooltip=None, icon=None, text=None, label=None, tooltip_placement="bottom") -%}
+{% macro render_link_button(url, tooltip=None, icon=None, text=None, label=None, classes="", tooltip_placement="bottom") -%}
 <a href="{{ url }}" target="_blank"
-   class="headerbtn{% if label %} headerbtn-{{ label }}{% endif %}"
+   class="btn btn-sm{% if label %} btn-{{ label }}{% endif %}{% if classes %} {{ classes }}{% endif %}"
    {% if tooltip %}{{ render_tooltip_metadata(tooltip, tooltip_placement) }}{% endif %}
 >
   {{ render_inner_html(icon, text) }}
@@ -31,9 +31,9 @@
 {% endmacro %}
 
 
-{% macro render_js_button(javascript, tooltip=None, icon=None, text=None, label=None, tooltip_placement="bottom") %}
+{% macro render_js_button(javascript, tooltip=None, icon=None, text=None, label=None, classes="", tooltip_placement="bottom") %}
 <button onclick="{{ javascript }}"
-  class="headerbtn{% if label %} headerbtn-{{ label }}{% endif %}"
+  class="btn btn-sm{% if label %} btn-{{ label }}{% endif %}{% if classes %} {{ classes }}{% endif %}"
   {% if tooltip %}{{ render_tooltip_metadata(tooltip, tooltip_placement) }}{% endif %}
 >
   {{ render_inner_html(icon, text) }}
@@ -41,31 +41,18 @@
 {% endmacro %}
 
 
-{% macro render_label_input_button(for_input, tooltip=None, icon=None, text=None, label=None, tooltip_placement="bottom") -%}
-<label for="{{ for_input }}"
-  class="headerbtn{% if label %} headerbtn-{{ label }}{% endif %}"
-  {% if tooltip %}{{ render_tooltip_metadata(tooltip, tooltip_placement) }}{% endif %}
->
-  {{ render_inner_html(icon, text) }}
-</label>
-{% endmacro %}
-
-
 {% macro render_button_group(buttons, icon, tooltip=None, label=None) %}
-<div class="menu-dropdown{% if label %} menu-dropdown-{{ label }}{% endif %}">
-  <button class="headerbtn menu-dropdown__trigger"
-      aria-label="{{ tooltip }}">
-      <i class="{{ icon }}"></i>
+{# A bootstrap dropdown #}
+{# Bootstrap dropdown ref: https://getbootstrap.com/docs/5.2/components/dropdowns/ #}
+<div class="dropdown">
+  <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false" aria-label="{{tooltip}}">
+    <i class="{{ icon }}"></i>
   </button>
-  <div class="menu-dropdown__content">
-    <ul>
+  <ul class="dropdown-menu">
       {%- for button in buttons %}
-      <li>
-        {{ render_funcs[button.pop("type")](**button) }}
-      </li>
+      <li>{{ render_funcs[button.pop("type")](classes="dropdown-item", **button) }}</a>
       {% endfor %}
-    </ul>
-  </div>
+  </ul>
 </div>
 {% endmacro %}
 
@@ -73,6 +60,5 @@
   "group" : render_button_group,
   "javascript" : render_js_button,
   "link": render_link_button,
-  "input_label": render_label_input_button,
 }
 -%}
diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html
index 9538c4b1..2e158d46 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/sections/header-article.html
@@ -1,10 +1,12 @@
 {# To trigger whether the TOC and its button show up #}
 {% set page_toc = generate_toc_html() %}
-{% from "../macros/buttons.html" import render_funcs, render_label_input_button with context %}
+{% from "../macros/buttons.html" import render_funcs with context %}
 
 <div class="col py-1 d-flex header-article-main">
     <div class="header-article__left">
-        {{ render_label_input_button(for_input="__primary", tooltip="Toggle navigation", icon="fas fa-bars", tooltip_placement="right") }}
+        <label class="sidebar-toggle primary-toggle btn btn-sm" for="__primary" data-toggle="tooltip" data-placement="right" title="Toggle primary sidebar">
+            <span class="fa-solid fa-bars"></span>
+        </label>
     </div>
     <div class="header-article__right">
         {%- for button in header_buttons -%}
@@ -12,7 +14,9 @@
         {%- endfor -%}
 
         {% if page_toc -%}
-        {{ render_label_input_button("__secondary", icon="fas fa-list", label="secondary") }}
+        <label class="sidebar-toggle secondary-toggle btn btn-sm" for="__secondary" data-toggle="tooltip" data-placement="left" title="Toggle secondary sidebar">
+            <span class="fa-solid fa-list"></span>
+        </label>
         {%- endif %}
     </div>
 </div>

From 36fa0a032526a24007d94ea183caea5d44cdacaa Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 14 Dec 2022 14:58:18 +0100
Subject: [PATCH 53/65] Cleaning up margin behavior

---
 docs/reference/special-theme-elements.md      |  2 +-
 src/sphinx_book_theme/__init__.py             |  2 +-
 .../assets/styles/abstracts/_variables.scss   |  5 +-
 .../assets/styles/content/_margin.scss        | 98 +++++++++++--------
 .../styles/sections/_sidebar-primary.scss     |  4 +-
 .../styles/sections/_sidebar-secondary.scss   | 25 +++--
 6 files changed, 79 insertions(+), 57 deletions(-)

diff --git a/docs/reference/special-theme-elements.md b/docs/reference/special-theme-elements.md
index 3b805c22..a44261bb 100644
--- a/docs/reference/special-theme-elements.md
+++ b/docs/reference/special-theme-elements.md
@@ -218,7 +218,7 @@ how does it look?
 
 Markdown cell with images in sidebar
 
-<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/38/Jupyter_logo.svg/883px-Jupyter_logo.svg.png" style="max-width:200px" />
+<img src="https://upload.wikimedia.org/wikipedia/commons/thumb/3/38/Jupyter_logo.svg/883px-Jupyter_logo.svg.png" />
 
 ````
 +++
diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index 3d265029..16ba569e 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -60,7 +60,7 @@ def add_metadata_to_page(app, pagename, templatename, context, doctree):
     context["translate"] = translation
     # this is set in the html_theme
     context["theme_search_bar_text"] = translation(
-        context.get("theme_search_bar_text", "Search...")
+        context.get("theme_search_bar_text", "Search the docs...")
     )
 
 
diff --git a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
index 498ca812..ef3694e0 100644
--- a/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
+++ b/src/sphinx_book_theme/assets/styles/abstracts/_variables.scss
@@ -18,13 +18,10 @@ $zindex-middle: 2;
 $zindex-top: 3;
 
 // Spacing
-$header-article-height: 3em;
+$header-article-height: 3rem;
 $sidebar-primary-width-widescreen: 20%;
 $toc-width-mobile: 75%;
 
-// Main content, to leave room for the margin
-$content-max-width: 75%;
-
 // Consistent styling for page elements
 $box-border-radius: 0.4em;
 
diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index 4ff08b33..be3d24a5 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -5,44 +5,39 @@
  * but if `.margin` classes are present, it shows up to the right in the margin
  * and the in-page TOC is hidden.
  * On narrow screens, margin content behaves like a sidebar
- */ 
+ */
 
-/** 
- * Variables
+/**
+ * Variables for calculating margin widths
  */
-// The % is relative to our parent container, which has width == max-width
-// full-width = 100% = content-max-width + margin-width
-// We must express margin-width as a percentage of max-width. So:
-// So the width we want is:
-// max-width * x = 100% - max-width, so we solve for x.
-// Will be a decimal
-$content-margin-gutter: 3%;
-$content-margin-width: percentage(
-    (100% - $content-max-width) / $content-max-width
-  ) - $content-margin-gutter;
-$content-margin-offset: (-$content-margin-width - $content-margin-gutter);
-
-// Express 100% in parent container in % units of the child container.
-$content-fullwidth-width: percentage(100% / $content-max-width);
+// We want our margin content to be 1/3 the width of the main page content
+// after factoring in a small margin
+$margin-width-relative-to-content: 36%;
+$margin-gutter: 3%;
+$margin-width-width-gutter: $margin-width-relative-to-content - $margin-gutter;
+
+// re-subtract the gutter width because we want it to leave a white-space
+// This is how much to offset the margin content.
+$margin-offset: -$margin-width-relative-to-content;
 
 /**
  * This mixin will cause something to "pop out" to the margin on wide screens
  */
 @mixin margin-content() {
+  // On narrow screens this is the width of margin content
   width: 40%;
   float: right;
   background-color: unset;
-  border-left: 1px var(--pst-color-border) solid;
   font-size: 0.9em;
+
   // This is the wide-screen behavior
-  @media (min-width: $breakpoint-md) {
-    border: none;
-    width: $content-margin-width;
-    margin: 0 $content-margin-offset 0 0;
+  @media (min-width: $breakpoint-lg) {
+    width: $margin-width-width-gutter;
+    margin: 0 $margin-offset 0 0;
+    padding: 0.5rem;
+
     // Prevent sequential margin content from overlapping
     clear: right;
-    // Slight padding so that admonition shadows still show
-    padding-right: .25rem;
 
     p.sidebar-title {
       margin-bottom: -1rem;
@@ -70,7 +65,7 @@ label.margin-toggle {
   sup {
     user-select: none;
   }
-  @media (max-width: $breakpoint-md) {
+  @media (max-width: $breakpoint-lg) {
     cursor: pointer;
     color: rgb(0, 113, 188);
     &.marginnote-label {
@@ -84,7 +79,7 @@ label.margin-toggle {
 
 input.margin-toggle {
   display: none;
-  @media (max-width: $breakpoint-md) {
+  @media (max-width: $breakpoint-lg) {
     &:checked + .sidenote,
     &:checked + .marginnote {
       display: block;
@@ -107,26 +102,45 @@ span.marginnote {
   }
   @include margin-content();
   border-left: none;
-  @media (max-width: $breakpoint-md) {
+  @media (max-width: $breakpoint-lg) {
     display: none;
   }
 }
 
-aside.sidebar {
-  .note {
-    // styling for notes inside sidebars
-    margin: 1rem;
-    padding: 0rem 0rem 1rem 0rem;
+/**
+ * Block-level margin content
+ */
+aside.sidebar.margin {
+  // Margin content can have an empty title so this prevents an empty title block
+  // from showing up on mobile
+  .sidebar-title:empty {
+    display: none;
   }
-  // The titles sticking
-  .admonition-title {
-    margin: 0rem -1rem 0rem 0rem;
+
+  // On narrow screens padding is added to all sidebar content
+  // This replaces padding w/ margin for admonitions because padding is used
+  // for the title background color
+  .admonition {
+    margin: 0.5rem;
+    padding-left: 0;
+    padding-right: 0;
+
+    // Remove the title margin so it
+    .admonition-title {
+      margin-left: 0;
+      margin-right: 0;
+    }
   }
-}
 
-aside.sidebar.margin {
-  .note {
-    margin: 1rem 0rem;
+  @media (min-width: $breakpoint-lg) {
+    // No border for margin sidebars on wide screen
+    border: none;
+
+    // Admonitions don't need the extra whitespace in the margin
+    .admonition {
+      margin: 1rem 0rem;
+      padding: 0rem 0rem 1rem 0rem;
+    }
   }
 }
 
@@ -162,13 +176,17 @@ figure.margin-caption figcaption {
 /**
  * Full width content
  */
+
+// Grow 100% by the ratio of the margin to the content width.
+$content-fullwidth-width: 100% + $margin-width-relative-to-content;
+
 div.cell.tag_full-width,
 div.cell.tag_full_width,
 div.full_width,
 div.full-width {
   z-index: $zindex-middle;
   position: relative;
-  @media (min-width: $breakpoint-md) {
+  @media (min-width: $breakpoint-lg) {
     max-width: $content-fullwidth-width;
     width: $content-fullwidth-width;
   }
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index d1c85621..3ab3e428 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -27,8 +27,8 @@
   }
 }
 
-@media (min-width: $breakpoint-md) {
 // Default visibility for left sidebar is the reverse of what it is on mobile.
+// It is shown by default, and hidden with a click.
 // Mobile behavior is defined in the pydata sphinx theme
 @media (min-width: $breakpoint-md) {
   input#__primary:checked ~ .bd-container .bd-sidebar-primary {
@@ -36,4 +36,4 @@
     visibility: hidden;
     opacity: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
index 0ceb3cae..4dfa6475 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-secondary.scss
@@ -6,6 +6,7 @@
   // Wide screen behavior
   @media (min-width: $breakpoint-md) {
     background: var(--pst-color-background);
+    height: fit-content;
     transition: max-height 0.4s ease;
 
     // To make sure it shows above the page content
@@ -16,19 +17,25 @@
 
     // This is the container div for the secondary sidebar nav
     .toc-item {
+      // Border is a bit less prominent
+      border-left-color: var(--pst-color-surface);
       // Flush with the top so that we can fix the height of the toc header div
       padding-top: 0;
 
-      // The 'on this page' title should take up the full header
+      // The 'on this page' title div should take up the full header
       .onthispage {
         height: $header-article-height;
         display: flex;
         align-items: center;
+      }
+
+      // The table of contents <ul> after the title div
+      nav.page-toc {
+        // Remove extra margin the PST adds for other sidebar items
+        margin-bottom: 0;
 
         // Items after "on this page' should fade in and out
-        + * {
-          transition: opacity 0.4s ease;
-        }
+        transition: opacity 0.4s ease;
       }
     }
 
@@ -44,7 +51,7 @@
         box-shadow: 0 6px 6px -6px rgba(0, 0, 0, 0.3);
       }
 
-      // Show a down carot when the sidebar is hidden
+      // Show a down carot
       .onthispage:after {
         opacity: 1;
         content: "\f107";
@@ -52,11 +59,11 @@
         font-weight: 900;
         padding-left: 0.5em;
         transition: opacity 0.3s ease;
+      }
 
-        // All subsequent elements are invisible when hidden
-        + * {
-          opacity: 0;
-        }
+      // The page-toc list is hidden
+      nav.page-toc {
+        opacity: 0;
       }
     }
   }

From 7e75ab1873e09056c871d9648085b936ee1a6b65 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed, 14 Dec 2022 13:59:19 +0000
Subject: [PATCH 54/65] [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci
---
 .../assets/styles/content/_notebooks.scss         |  2 +-
 .../assets/styles/sections/_header-article.scss   | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/content/_notebooks.scss b/src/sphinx_book_theme/assets/styles/content/_notebooks.scss
index 4ac5ad02..3c08a02e 100644
--- a/src/sphinx_book_theme/assets/styles/content/_notebooks.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_notebooks.scss
@@ -3,4 +3,4 @@ div.cell.tag_output_scroll div.cell_output,
 div.cell.tag_scroll-output div.cell_output {
   max-height: 24em;
   overflow-y: auto;
-}
\ No newline at end of file
+}
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index c7b7907c..cc419cf4 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -5,7 +5,7 @@
  * Mixin:
  * Header behavior on mobile
  */
- @mixin header-height-mobile {
+@mixin header-height-mobile {
   @media (max-width: $breakpoint-md) {
     height: $header-article-height + 0.75rem;
   }
@@ -74,12 +74,15 @@ div.header-article-main {
     border: none;
 
     // Hover / active behavior
-    &.show,&:hover,&:focus,&:active {
+    &.show,
+    &:hover,
+    &:focus,
+    &:active {
       color: var(--pst-color-text-base);
       border: none;
     }
 
-    &.dropdown-toggle {      
+    &.dropdown-toggle {
       // Hide the bootstrap caret
       &:after {
         display: none;
@@ -93,7 +96,7 @@ div.header-article-main {
     .dropdown-item {
       display: inline-flex;
       align-items: center;
-      padding-left: .5em;
+      padding-left: 0.5em;
 
       // To prevent link underline from showing up
       &:hover {
@@ -102,7 +105,7 @@ div.header-article-main {
 
       // Slightly smaller font for everything
       font-size: 1em;
-      
+
       // Image icons should be the same height as <i> icons
       span img {
         height: 1em;
@@ -116,4 +119,4 @@ div.header-article-main {
       }
     }
   }
-}
\ No newline at end of file
+}

From 6c72078103aa68bcde471a1707a6c8e98e2ff619 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 14 Dec 2022 15:00:38 +0100
Subject: [PATCH 55/65] Changelog error

---
 src/sphinx_book_theme/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index 16ba569e..b8ae65b6 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -159,7 +159,7 @@ def check_deprecation_keys(app):
     for key in deprecated_config_list:
         if key in app.env.config.html_theme_options:
             SPHINX_LOGGER.warning(
-                f"'{key}' was deprecated from version 0.3.4 onwards. Please see the CHANGELOG for more information."  # noqa: E501
+                f"'{key}' was deprecated from version 0.3.4 onwards. See the CHANGELOG for more information: https://github.com/executablebooks/sphinx-book-theme/blob/master/CHANGELOG.md"  # noqa: E501
                 f"[{DEFAULT_LOG_TYPE}]",
                 type=DEFAULT_LOG_TYPE,
             )

From 0785986e343919b8e52f55f1ee6590b8e7a420b2 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 14 Dec 2022 15:08:27 +0100
Subject: [PATCH 56/65] Fix tests

---
 .../sphinx_book_theme/macros/buttons.html     |   2 +-
 tests/test_build.py                           |   2 +-
 tests/test_build/build__header-article.html   | 146 +++++++++---------
 .../header__repo-buttons--all-off.html        |  42 +++--
 .../header__repo-buttons--all-on.html         | 102 ++++++------
 .../header__repo-buttons--custom-branch.html  |  76 +++++----
 .../header__repo-buttons--one-on.html         |  46 +++---
 tests/test_build/test_header_launchbtns.html  |  98 ++++++------
 8 files changed, 247 insertions(+), 267 deletions(-)

diff --git a/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html b/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
index d908cf3d..b0bf892a 100644
--- a/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
+++ b/src/sphinx_book_theme/theme/sphinx_book_theme/macros/buttons.html
@@ -44,7 +44,7 @@
 {% macro render_button_group(buttons, icon, tooltip=None, label=None) %}
 {# A bootstrap dropdown #}
 {# Bootstrap dropdown ref: https://getbootstrap.com/docs/5.2/components/dropdowns/ #}
-<div class="dropdown">
+<div class="dropdown{% if label %} dropdown-{{ label }}{% endif %}">
   <button class="btn dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false" aria-label="{{tooltip}}">
     <i class="{{ icon }}"></i>
   </button>
diff --git a/tests/test_build.py b/tests/test_build.py
index 0330d27b..1ee5a940 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -207,7 +207,7 @@ def test_header_launchbtns(sphinx_build_factory, file_regression):
     """Test launch buttons."""
     sphinx_build = sphinx_build_factory("base").build(assert_pass=True)
     launch_btns = sphinx_build.html_tree("section1", "ntbk.html").select(
-        ".menu-dropdown-launch-buttons"
+        ".dropdown-launch-buttons"
     )
     file_regression.check(launch_btns[0].prettify(), extension=".html", encoding="utf8")
 
diff --git a/tests/test_build/build__header-article.html b/tests/test_build/build__header-article.html
index 9af46817..d51ee606 100644
--- a/tests/test_build/build__header-article.html
+++ b/tests/test_build/build__header-article.html
@@ -1,112 +1,106 @@
 <div class="bd-header-article">
  <div class="col py-1 d-flex header-article-main">
   <div class="header-article__left">
-   <label class="headerbtn" data-placement="right" data-toggle="tooltip" for="__primary" title="Toggle navigation">
-    <span class="headerbtn__icon-container">
-     <i class="fas fa-bars">
-     </i>
+   <label class="sidebar-toggle primary-toggle btn btn-sm" data-placement="right" data-toggle="tooltip" for="__primary" title="Toggle primary sidebar">
+    <span class="fa-solid fa-bars">
     </span>
    </label>
   </div>
   <div class="header-article__right">
-   <div class="menu-dropdown menu-dropdown-launch-buttons">
-    <button aria-label="Launch interactive content" class="headerbtn menu-dropdown__trigger">
+   <div class="dropdown">
+    <button aria-expanded="false" aria-label="Launch interactive content" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
      <i class="fas fa-rocket">
      </i>
     </button>
-    <div class="menu-dropdown__content">
-     <ul>
+    <ul class="dropdown-menu">
+     <li>
+      <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
+       <span class="btn__icon-container">
+        <img src="../_static/images/logo_binder.svg"/>
+       </span>
+       <span class="btn__text-container">
+        Binder
+       </span>
+      </a>
       <li>
-       <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
-        <span class="headerbtn__icon-container">
-         <img src="../_static/images/logo_binder.svg"/>
-        </span>
-        <span class="headerbtn__text-container">
-         Binder
-        </span>
-       </a>
-      </li>
-      <li>
-       <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch on JupyterHub">
-        <span class="headerbtn__icon-container">
+       <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch on JupyterHub">
+        <span class="btn__icon-container">
          <img src="../_static/images/logo_jupyterhub.svg"/>
         </span>
-        <span class="headerbtn__text-container">
+        <span class="btn__text-container">
          JupyterHub
         </span>
        </a>
+       <li>
+        <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Colab">
+         <span class="btn__icon-container">
+          <img src="../_static/images/logo_colab.png"/>
+         </span>
+         <span class="btn__text-container">
+          Colab
+         </span>
+        </a>
+        <li>
+         <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Deepnote">
+          <span class="btn__icon-container">
+           <img src="../_static/images/logo_deepnote.svg"/>
+          </span>
+          <span class="btn__text-container">
+           Deepnote
+          </span>
+         </a>
+         <li>
+          <button class="btn btn-sm btn-launch-thebe dropdown-item" data-placement="left" data-toggle="tooltip" onclick="initThebeSBT()" title="Launch Thebe">
+           <span class="btn__icon-container">
+            <i class="fas fa-play">
+            </i>
+           </span>
+           <span class="btn__text-container">
+            Live Code
+           </span>
+          </button>
+         </li>
+        </li>
+       </li>
       </li>
-      <li>
-       <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Colab">
-        <span class="headerbtn__icon-container">
-         <img src="../_static/images/logo_colab.png"/>
-        </span>
-        <span class="headerbtn__text-container">
-         Colab
-        </span>
-       </a>
-      </li>
-      <li>
-       <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Deepnote">
-        <span class="headerbtn__icon-container">
-         <img src="../_static/images/logo_deepnote.svg"/>
-        </span>
-        <span class="headerbtn__text-container">
-         Deepnote
-        </span>
-       </a>
-      </li>
-      <li>
-       <button class="headerbtn headerbtn-launch-thebe" data-placement="left" data-toggle="tooltip" onclick="initThebeSBT()" title="Launch Thebe">
-        <span class="headerbtn__icon-container">
-         <i class="fas fa-play">
-         </i>
-        </span>
-        <span class="headerbtn__text-container">
-         Live Code
-        </span>
-       </button>
-      </li>
-     </ul>
-    </div>
+     </li>
+    </ul>
    </div>
-   <button class="headerbtn" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
-    <span class="headerbtn__icon-container">
+   <button class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
+    <span class="btn__icon-container">
      <i class="fas fa-expand">
      </i>
     </span>
    </button>
-   <div class="menu-dropdown menu-dropdown-download-buttons">
-    <button aria-label="Download this page" class="headerbtn menu-dropdown__trigger">
+   <div class="dropdown">
+    <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
      <i class="fas fa-download">
      </i>
     </button>
-    <div class="menu-dropdown__content">
-     <ul>
-      <li>
-       <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
-        <span class="headerbtn__icon-container">
-         <i class="fas fa-file">
-         </i>
-        </span>
-        <span class="headerbtn__text-container">
-         .ipynb
-        </span>
-       </a>
-      </li>
+    <ul class="dropdown-menu">
+     <li>
+      <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
+       <span class="btn__icon-container">
+        <i class="fas fa-file">
+        </i>
+       </span>
+       <span class="btn__text-container">
+        .ipynb
+       </span>
+      </a>
       <li>
-       <button class="headerbtn" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
-        <span class="headerbtn__icon-container">
+       <button class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
+        <span class="btn__icon-container">
          <i class="fas fa-file-pdf">
          </i>
         </span>
-        <span class="headerbtn__text-container">
+        <span class="btn__text-container">
          .pdf
         </span>
        </button>
       </li>
-     </ul>
-    </div>
+     </li>
+    </ul>
    </div>
   </div>
  </div>
diff --git a/tests/test_build/header__repo-buttons--all-off.html b/tests/test_build/header__repo-buttons--all-off.html
index 974936f2..e5bad17f 100644
--- a/tests/test_build/header__repo-buttons--all-off.html
+++ b/tests/test_build/header__repo-buttons--all-off.html
@@ -1,40 +1,38 @@
 <div class="header-article__right">
- <button class="headerbtn" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
-  <span class="headerbtn__icon-container">
+ <button class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
+  <span class="btn__icon-container">
    <i class="fas fa-expand">
    </i>
   </span>
  </button>
- <div class="menu-dropdown menu-dropdown-download-buttons">
-  <button aria-label="Download this page" class="headerbtn menu-dropdown__trigger">
+ <div class="dropdown">
+  <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
   </button>
-  <div class="menu-dropdown__content">
-   <ul>
+  <ul class="dropdown-menu">
+   <li>
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
+     <span class="btn__icon-container">
+      <i class="fas fa-file">
+      </i>
+     </span>
+     <span class="btn__text-container">
+      .ipynb
+     </span>
+    </a>
     <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
-      <span class="headerbtn__icon-container">
-       <i class="fas fa-file">
-       </i>
-      </span>
-      <span class="headerbtn__text-container">
-       .ipynb
-      </span>
-     </a>
-    </li>
-    <li>
-     <button class="headerbtn" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
-      <span class="headerbtn__icon-container">
+     <button class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
+      <span class="btn__icon-container">
        <i class="fas fa-file-pdf">
        </i>
       </span>
-      <span class="headerbtn__text-container">
+      <span class="btn__text-container">
        .pdf
       </span>
      </button>
     </li>
-   </ul>
-  </div>
+   </li>
+  </ul>
  </div>
 </div>
diff --git a/tests/test_build/header__repo-buttons--all-on.html b/tests/test_build/header__repo-buttons--all-on.html
index 07db049b..711a3e7e 100644
--- a/tests/test_build/header__repo-buttons--all-on.html
+++ b/tests/test_build/header__repo-buttons--all-on.html
@@ -1,83 +1,79 @@
 <div class="header-article__right">
- <button class="headerbtn" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
-  <span class="headerbtn__icon-container">
+ <button class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
+  <span class="btn__icon-container">
    <i class="fas fa-expand">
    </i>
   </span>
  </button>
- <div class="menu-dropdown menu-dropdown-repository-buttons">
-  <button aria-label="Source repositories" class="headerbtn menu-dropdown__trigger">
+ <div class="dropdown">
+  <button aria-expanded="false" aria-label="Source repositories" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fab fa-github">
    </i>
   </button>
-  <div class="menu-dropdown__content">
-   <ul>
+  <ul class="dropdown-menu">
+   <li>
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme" target="_blank" title="Source repository">
+     <span class="btn__icon-container">
+      <i class="fab fa-github">
+      </i>
+     </span>
+     <span class="btn__text-container">
+      repository
+     </span>
+    </a>
     <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme" target="_blank" title="Source repository">
-      <span class="headerbtn__icon-container">
-       <i class="fab fa-github">
-       </i>
-      </span>
-      <span class="headerbtn__text-container">
-       repository
-      </span>
-     </a>
-    </li>
-    <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/issues/new?title=Issue%20on%20page%20%2Fsection1/ntbk.html&amp;body=Your%20issue%20content%20here." target="_blank" title="Open an issue">
-      <span class="headerbtn__icon-container">
+     <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/issues/new?title=Issue%20on%20page%20%2Fsection1/ntbk.html&amp;body=Your%20issue%20content%20here." target="_blank" title="Open an issue">
+      <span class="btn__icon-container">
        <i class="fas fa-lightbulb">
        </i>
       </span>
-      <span class="headerbtn__text-container">
+      <span class="btn__text-container">
        open issue
       </span>
      </a>
+     <li>
+      <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/edit/master/section1/ntbk.ipynb" target="_blank" title="Edit this page">
+       <span class="btn__icon-container">
+        <i class="fas fa-pencil-alt">
+        </i>
+       </span>
+       <span class="btn__text-container">
+        suggest edit
+       </span>
+      </a>
+     </li>
     </li>
-    <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/edit/master/section1/ntbk.ipynb" target="_blank" title="Edit this page">
-      <span class="headerbtn__icon-container">
-       <i class="fas fa-pencil-alt">
-       </i>
-      </span>
-      <span class="headerbtn__text-container">
-       suggest edit
-      </span>
-     </a>
-    </li>
-   </ul>
-  </div>
+   </li>
+  </ul>
  </div>
- <div class="menu-dropdown menu-dropdown-download-buttons">
-  <button aria-label="Download this page" class="headerbtn menu-dropdown__trigger">
+ <div class="dropdown">
+  <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
   </button>
-  <div class="menu-dropdown__content">
-   <ul>
-    <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
-      <span class="headerbtn__icon-container">
-       <i class="fas fa-file">
-       </i>
-      </span>
-      <span class="headerbtn__text-container">
-       .ipynb
-      </span>
-     </a>
-    </li>
+  <ul class="dropdown-menu">
+   <li>
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
+     <span class="btn__icon-container">
+      <i class="fas fa-file">
+      </i>
+     </span>
+     <span class="btn__text-container">
+      .ipynb
+     </span>
+    </a>
     <li>
-     <button class="headerbtn" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
-      <span class="headerbtn__icon-container">
+     <button class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
+      <span class="btn__icon-container">
        <i class="fas fa-file-pdf">
        </i>
       </span>
-      <span class="headerbtn__text-container">
+      <span class="btn__text-container">
        .pdf
       </span>
      </button>
     </li>
-   </ul>
-  </div>
+   </li>
+  </ul>
  </div>
 </div>
diff --git a/tests/test_build/header__repo-buttons--custom-branch.html b/tests/test_build/header__repo-buttons--custom-branch.html
index 72528702..930745c4 100644
--- a/tests/test_build/header__repo-buttons--custom-branch.html
+++ b/tests/test_build/header__repo-buttons--custom-branch.html
@@ -1,66 +1,62 @@
 <div class="header-article__right">
- <div class="menu-dropdown menu-dropdown-launch-buttons">
-  <button aria-label="Launch interactive content" class="headerbtn menu-dropdown__trigger">
+ <div class="dropdown">
+  <button aria-expanded="false" aria-label="Launch interactive content" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-rocket">
    </i>
   </button>
-  <div class="menu-dropdown__content">
-   <ul>
-    <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/foo?urlpath=tree/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
-      <span class="headerbtn__icon-container">
-       <img src="../_static/images/logo_binder.svg"/>
-      </span>
-      <span class="headerbtn__text-container">
-       Binder
-      </span>
-     </a>
-    </li>
-   </ul>
-  </div>
+  <ul class="dropdown-menu">
+   <li>
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/foo?urlpath=tree/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
+     <span class="btn__icon-container">
+      <img src="../_static/images/logo_binder.svg"/>
+     </span>
+     <span class="btn__text-container">
+      Binder
+     </span>
+    </a>
+   </li>
+  </ul>
  </div>
- <button class="headerbtn" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
-  <span class="headerbtn__icon-container">
+ <button class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
+  <span class="btn__icon-container">
    <i class="fas fa-expand">
    </i>
   </span>
  </button>
- <a class="headerbtn" data-placement="bottom" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/edit/foo/section1/ntbk.ipynb" target="_blank" title="Edit this page">
-  <span class="headerbtn__icon-container">
+ <a class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/edit/foo/section1/ntbk.ipynb" target="_blank" title="Edit this page">
+  <span class="btn__icon-container">
    <i class="fas fa-pencil-alt">
    </i>
   </span>
  </a>
- <div class="menu-dropdown menu-dropdown-download-buttons">
-  <button aria-label="Download this page" class="headerbtn menu-dropdown__trigger">
+ <div class="dropdown">
+  <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
   </button>
-  <div class="menu-dropdown__content">
-   <ul>
-    <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
-      <span class="headerbtn__icon-container">
-       <i class="fas fa-file">
-       </i>
-      </span>
-      <span class="headerbtn__text-container">
-       .ipynb
-      </span>
-     </a>
-    </li>
+  <ul class="dropdown-menu">
+   <li>
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
+     <span class="btn__icon-container">
+      <i class="fas fa-file">
+      </i>
+     </span>
+     <span class="btn__text-container">
+      .ipynb
+     </span>
+    </a>
     <li>
-     <button class="headerbtn" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
-      <span class="headerbtn__icon-container">
+     <button class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
+      <span class="btn__icon-container">
        <i class="fas fa-file-pdf">
        </i>
       </span>
-      <span class="headerbtn__text-container">
+      <span class="btn__text-container">
        .pdf
       </span>
      </button>
     </li>
-   </ul>
-  </div>
+   </li>
+  </ul>
  </div>
 </div>
diff --git a/tests/test_build/header__repo-buttons--one-on.html b/tests/test_build/header__repo-buttons--one-on.html
index cd8fc950..ca886283 100644
--- a/tests/test_build/header__repo-buttons--one-on.html
+++ b/tests/test_build/header__repo-buttons--one-on.html
@@ -1,46 +1,44 @@
 <div class="header-article__right">
- <button class="headerbtn" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
-  <span class="headerbtn__icon-container">
+ <button class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" onclick="toggleFullScreen()" title="Fullscreen mode">
+  <span class="btn__icon-container">
    <i class="fas fa-expand">
    </i>
   </span>
  </button>
- <a class="headerbtn" data-placement="bottom" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/edit/master/section1/ntbk.ipynb" target="_blank" title="Edit this page">
-  <span class="headerbtn__icon-container">
+ <a class="btn btn-sm" data-placement="bottom" data-toggle="tooltip" href="https://github.com/executablebooks/sphinx-book-theme/edit/master/section1/ntbk.ipynb" target="_blank" title="Edit this page">
+  <span class="btn__icon-container">
    <i class="fas fa-pencil-alt">
    </i>
   </span>
  </a>
- <div class="menu-dropdown menu-dropdown-download-buttons">
-  <button aria-label="Download this page" class="headerbtn menu-dropdown__trigger">
+ <div class="dropdown">
+  <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
   </button>
-  <div class="menu-dropdown__content">
-   <ul>
+  <ul class="dropdown-menu">
+   <li>
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
+     <span class="btn__icon-container">
+      <i class="fas fa-file">
+      </i>
+     </span>
+     <span class="btn__text-container">
+      .ipynb
+     </span>
+    </a>
     <li>
-     <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="../_sources/section1/ntbk.ipynb" target="_blank" title="Download source file">
-      <span class="headerbtn__icon-container">
-       <i class="fas fa-file">
-       </i>
-      </span>
-      <span class="headerbtn__text-container">
-       .ipynb
-      </span>
-     </a>
-    </li>
-    <li>
-     <button class="headerbtn" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
-      <span class="headerbtn__icon-container">
+     <button class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" onclick="printPdf(this)" title="Print to PDF">
+      <span class="btn__icon-container">
        <i class="fas fa-file-pdf">
        </i>
       </span>
-      <span class="headerbtn__text-container">
+      <span class="btn__text-container">
        .pdf
       </span>
      </button>
     </li>
-   </ul>
-  </div>
+   </li>
+  </ul>
  </div>
 </div>
diff --git a/tests/test_build/test_header_launchbtns.html b/tests/test_build/test_header_launchbtns.html
index 0cc5b051..f7ad68a3 100644
--- a/tests/test_build/test_header_launchbtns.html
+++ b/tests/test_build/test_header_launchbtns.html
@@ -1,61 +1,59 @@
-<div class="menu-dropdown menu-dropdown-launch-buttons">
- <button aria-label="Launch interactive content" class="headerbtn menu-dropdown__trigger">
+<div class="dropdown dropdown-launch-buttons">
+ <button aria-expanded="false" aria-label="Launch interactive content" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
   <i class="fas fa-rocket">
   </i>
  </button>
- <div class="menu-dropdown__content">
-  <ul>
+ <ul class="dropdown-menu">
+  <li>
+   <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
+    <span class="btn__icon-container">
+     <img src="../_static/images/logo_binder.svg"/>
+    </span>
+    <span class="btn__text-container">
+     Binder
+    </span>
+   </a>
    <li>
-    <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://mybinder.org/v2/gh/executablebooks/sphinx-book-theme/master?urlpath=lab/tree/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Binder">
-     <span class="headerbtn__icon-container">
-      <img src="../_static/images/logo_binder.svg"/>
-     </span>
-     <span class="headerbtn__text-container">
-      Binder
-     </span>
-    </a>
-   </li>
-   <li>
-    <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch on JupyterHub">
-     <span class="headerbtn__icon-container">
+    <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://datahub.berkeley.edu/hub/user-redirect/git-pull?repo=https%3A//github.com/executablebooks/sphinx-book-theme&amp;urlpath=lab/tree/sphinx-book-theme/TESTPATH/section1/ntbk.ipynb&amp;branch=master" target="_blank" title="Launch on JupyterHub">
+     <span class="btn__icon-container">
       <img src="../_static/images/logo_jupyterhub.svg"/>
      </span>
-     <span class="headerbtn__text-container">
+     <span class="btn__text-container">
       JupyterHub
      </span>
     </a>
+    <li>
+     <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Colab">
+      <span class="btn__icon-container">
+       <img src="../_static/images/logo_colab.png"/>
+      </span>
+      <span class="btn__text-container">
+       Colab
+      </span>
+     </a>
+     <li>
+      <a class="btn btn-sm dropdown-item" data-placement="left" data-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Deepnote">
+       <span class="btn__icon-container">
+        <img src="../_static/images/logo_deepnote.svg"/>
+       </span>
+       <span class="btn__text-container">
+        Deepnote
+       </span>
+      </a>
+      <li>
+       <button class="btn btn-sm btn-launch-thebe dropdown-item" data-placement="left" data-toggle="tooltip" onclick="initThebeSBT()" title="Launch Thebe">
+        <span class="btn__icon-container">
+         <i class="fas fa-play">
+         </i>
+        </span>
+        <span class="btn__text-container">
+         Live Code
+        </span>
+       </button>
+      </li>
+     </li>
+    </li>
    </li>
-   <li>
-    <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://colab.research.google.com/github/executablebooks/sphinx-book-theme/blob/master/TESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Colab">
-     <span class="headerbtn__icon-container">
-      <img src="../_static/images/logo_colab.png"/>
-     </span>
-     <span class="headerbtn__text-container">
-      Colab
-     </span>
-    </a>
-   </li>
-   <li>
-    <a class="headerbtn" data-placement="left" data-toggle="tooltip" href="https://deepnote.com/launch?url=https%3A%2F%2Fgithub.com%2Fexecutablebooks%2Fsphinx-book-theme%2Fblob%2Fmaster%2FTESTPATH/section1/ntbk.ipynb" target="_blank" title="Launch on Deepnote">
-     <span class="headerbtn__icon-container">
-      <img src="../_static/images/logo_deepnote.svg"/>
-     </span>
-     <span class="headerbtn__text-container">
-      Deepnote
-     </span>
-    </a>
-   </li>
-   <li>
-    <button class="headerbtn headerbtn-launch-thebe" data-placement="left" data-toggle="tooltip" onclick="initThebeSBT()" title="Launch Thebe">
-     <span class="headerbtn__icon-container">
-      <i class="fas fa-play">
-      </i>
-     </span>
-     <span class="headerbtn__text-container">
-      Live Code
-     </span>
-    </button>
-   </li>
-  </ul>
- </div>
+  </li>
+ </ul>
 </div>

From 6d52144f0669599948094ca2ef7d3672c8fbd0a8 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 14 Dec 2022 15:14:25 +0100
Subject: [PATCH 57/65] More test fixes

---
 tests/test_build/build__header-article.html               | 4 ++--
 tests/test_build/header__repo-buttons--all-off.html       | 2 +-
 tests/test_build/header__repo-buttons--all-on.html        | 4 ++--
 tests/test_build/header__repo-buttons--custom-branch.html | 4 ++--
 tests/test_build/header__repo-buttons--one-on.html        | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/test_build/build__header-article.html b/tests/test_build/build__header-article.html
index d51ee606..f6d19f81 100644
--- a/tests/test_build/build__header-article.html
+++ b/tests/test_build/build__header-article.html
@@ -7,7 +7,7 @@
    </label>
   </div>
   <div class="header-article__right">
-   <div class="dropdown">
+   <div class="dropdown dropdown-launch-buttons">
     <button aria-expanded="false" aria-label="Launch interactive content" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
      <i class="fas fa-rocket">
      </i>
@@ -72,7 +72,7 @@
      </i>
     </span>
    </button>
-   <div class="dropdown">
+   <div class="dropdown dropdown-download-buttons">
     <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
      <i class="fas fa-download">
      </i>
diff --git a/tests/test_build/header__repo-buttons--all-off.html b/tests/test_build/header__repo-buttons--all-off.html
index e5bad17f..4f64911f 100644
--- a/tests/test_build/header__repo-buttons--all-off.html
+++ b/tests/test_build/header__repo-buttons--all-off.html
@@ -5,7 +5,7 @@
    </i>
   </span>
  </button>
- <div class="dropdown">
+ <div class="dropdown dropdown-download-buttons">
   <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
diff --git a/tests/test_build/header__repo-buttons--all-on.html b/tests/test_build/header__repo-buttons--all-on.html
index 711a3e7e..deeba025 100644
--- a/tests/test_build/header__repo-buttons--all-on.html
+++ b/tests/test_build/header__repo-buttons--all-on.html
@@ -5,7 +5,7 @@
    </i>
   </span>
  </button>
- <div class="dropdown">
+ <div class="dropdown dropdown-repository-buttons">
   <button aria-expanded="false" aria-label="Source repositories" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fab fa-github">
    </i>
@@ -46,7 +46,7 @@
    </li>
   </ul>
  </div>
- <div class="dropdown">
+ <div class="dropdown dropdown-download-buttons">
   <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
diff --git a/tests/test_build/header__repo-buttons--custom-branch.html b/tests/test_build/header__repo-buttons--custom-branch.html
index 930745c4..8e93d2c0 100644
--- a/tests/test_build/header__repo-buttons--custom-branch.html
+++ b/tests/test_build/header__repo-buttons--custom-branch.html
@@ -1,5 +1,5 @@
 <div class="header-article__right">
- <div class="dropdown">
+ <div class="dropdown dropdown-launch-buttons">
   <button aria-expanded="false" aria-label="Launch interactive content" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-rocket">
    </i>
@@ -29,7 +29,7 @@
    </i>
   </span>
  </a>
- <div class="dropdown">
+ <div class="dropdown dropdown-download-buttons">
   <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>
diff --git a/tests/test_build/header__repo-buttons--one-on.html b/tests/test_build/header__repo-buttons--one-on.html
index ca886283..a33b6a3e 100644
--- a/tests/test_build/header__repo-buttons--one-on.html
+++ b/tests/test_build/header__repo-buttons--one-on.html
@@ -11,7 +11,7 @@
    </i>
   </span>
  </a>
- <div class="dropdown">
+ <div class="dropdown dropdown-download-buttons">
   <button aria-expanded="false" aria-label="Download this page" class="btn dropdown-toggle" data-bs-toggle="dropdown" type="button">
    <i class="fas fa-download">
    </i>

From 49a61552cf91994373b3bbff9c376d4b50dfab65 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Wed, 14 Dec 2022 18:12:50 +0100
Subject: [PATCH 58/65] Move install to pyproject

---
 pyproject.toml | 2 +-
 tox.ini        | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index a3ba6f39..c1240bb9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [
   "sphinx>=4,<6",
-  "pydata-sphinx-theme~=0.12.0",
+  "pydata-sphinx-theme@git+https://github.com/pydata/pydata-sphinx-theme",
   "pyyaml",
 ]
 
diff --git a/tox.ini b/tox.ini
index 8a1ea7a6..00432d0b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,10 +41,6 @@ extras =
 deps =
     sphinx-theme-builder[cli]
 commands =
-    ###### REMOVE THIS BEFORE MERGING PR
-    ###### OR WHEN NEW PYDATA THEME IS RELEASED
-    pip install git+https://github.com/pydata/pydata-sphinx-theme
-    ######
     stb serve docs --open-browser
 
 [testenv:py{37,38,39}-sphinx{4,5}]

From a5c99c259cd32b889e06e184992a4c6a89019b81 Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Thu, 15 Dec 2022 13:37:33 +0100
Subject: [PATCH 59/65] Pinning to latest release of pydata theme

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index c1240bb9..a3ba6f39 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ readme = "README.md"
 requires-python = ">=3.7"
 dependencies = [
   "sphinx>=4,<6",
-  "pydata-sphinx-theme@git+https://github.com/pydata/pydata-sphinx-theme",
+  "pydata-sphinx-theme~=0.12.0",
   "pyyaml",
 ]
 

From 4bc057cd256153fad5e199d7f89e66564fdd49f9 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 19 Dec 2022 21:47:27 +1100
Subject: [PATCH 60/65] flex-basis primary-sidebar

---
 .../assets/styles/sections/_sidebar-primary.scss                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
index 3ab3e428..5d4bc2fa 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_sidebar-primary.scss
@@ -23,7 +23,7 @@
 
   // On wide screens we have a smaller sidebar width than PST
   @media (min-width: $breakpoint-md) {
-    width: $sidebar-primary-width-widescreen;
+    flex-basis: $sidebar-primary-width-widescreen;
   }
 }
 

From 3b886b7efa5dc73001178cdd2034d2af1f9daada Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Mon, 19 Dec 2022 21:57:45 +1100
Subject: [PATCH 61/65] search text

---
 src/sphinx_book_theme/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/__init__.py b/src/sphinx_book_theme/__init__.py
index b8ae65b6..9469020a 100644
--- a/src/sphinx_book_theme/__init__.py
+++ b/src/sphinx_book_theme/__init__.py
@@ -60,7 +60,7 @@ def add_metadata_to_page(app, pagename, templatename, context, doctree):
     context["translate"] = translation
     # this is set in the html_theme
     context["theme_search_bar_text"] = translation(
-        context.get("theme_search_bar_text", "Search the docs...")
+        context.get("theme_search_bar_text", "Search...")
     )
 
 

From a85670157e2a716df2fd0410b04d4f293d57a24a Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 20 Dec 2022 19:12:30 +1100
Subject: [PATCH 62/65] menu dropdown css

---
 .../styles/sections/_header-article.scss      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index cc419cf4..02c474b9 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -72,14 +72,19 @@ div.header-article-main {
     font-size: 1.3rem;
     color: var(--pst-color-text-muted);
     border: none;
+    padding: 0 0.75rem;
 
     // Hover / active behavior
     &.show,
-    &:hover,
-    &:focus,
-    &:active {
+    &:hover {
       color: var(--pst-color-text-base);
       border: none;
+      & + .dropdown-menu {
+        display: block;
+      }
+    }
+    &:focus {
+      box-shadow: none;
     }
 
     &.dropdown-toggle {
@@ -90,9 +95,14 @@ div.header-article-main {
     }
   }
 
-  // The menu that is normally hidden until you click
+  // The menu that is normally hidden until you hover
   .dropdown-menu {
     // Positioning and layout of dropdown items to be standardized
+    margin-top: 0px;
+    transform: translateX(-75%);
+    &:hover {
+      display: block;
+    }
     .dropdown-item {
       display: inline-flex;
       align-items: center;
@@ -101,6 +111,7 @@ div.header-article-main {
       // To prevent link underline from showing up
       &:hover {
         text-decoration: none;
+        background-color: initial;
       }
 
       // Slightly smaller font for everything

From ef50585bec52905fe85c448ef08d1961494a6e81 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Tue, 20 Dec 2022 19:31:38 +1100
Subject: [PATCH 63/65] alignment of buttons

---
 .../assets/styles/sections/_header-article.scss             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index 02c474b9..bd0fdbf1 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -19,6 +19,9 @@ label.sidebar-toggle.primary-toggle {
   @media (min-width: $breakpoint-md) {
     display: inline-block;
   }
+  @media (max-width: $breakpoint-md) {
+    margin-bottom: 0px;
+  }
 }
 
 // Secondary toggle mimics behavior of "persistent header" div of PST
@@ -26,6 +29,9 @@ label.sidebar-toggle.secondary-toggle {
   @media (min-width: $breakpoint-lg) {
     display: none;
   }
+  @media (max-width: $breakpoint-md) {
+    margin-bottom: 0px;
+  }
 }
 
 // Wrapper container

From 204c1fc6e6ee5fa1752fbf94883042b8984595b2 Mon Sep 17 00:00:00 2001
From: AakashGC <aakashguptachoudhury@gmail.com>
Date: Wed, 21 Dec 2022 14:16:55 +1100
Subject: [PATCH 64/65] sidebar and margin fixes

---
 .../assets/styles/content/_margin.scss              | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index be3d24a5..31fead93 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -34,7 +34,6 @@ $margin-offset: -$margin-width-relative-to-content;
   @media (min-width: $breakpoint-lg) {
     width: $margin-width-width-gutter;
     margin: 0 $margin-offset 0 0;
-    padding: 0.5rem;
 
     // Prevent sequential margin content from overlapping
     clear: right;
@@ -107,6 +106,18 @@ span.marginnote {
   }
 }
 
+aside.sidebar {
+  .note {
+    // styling for notes inside sidebars
+    margin: 1rem;
+    padding: 0rem 0rem 1rem 0rem;
+  }
+  // The titles sticking
+  .admonition-title {
+    margin: 0rem -1rem 0rem 0rem;
+  }
+}
+
 /**
  * Block-level margin content
  */

From 70ffec923ff012f4d4d4a45f08d896bfc3b5365e Mon Sep 17 00:00:00 2001
From: Chris Holdgraf <choldgraf@berkeley.edu>
Date: Thu, 5 Jan 2023 11:05:47 +0100
Subject: [PATCH 65/65] Tweaking two items

---
 .../assets/styles/content/_margin.scss                 |  4 +++-
 .../assets/styles/sections/_header-article.scss        | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/sphinx_book_theme/assets/styles/content/_margin.scss b/src/sphinx_book_theme/assets/styles/content/_margin.scss
index 31fead93..264f01fe 100644
--- a/src/sphinx_book_theme/assets/styles/content/_margin.scss
+++ b/src/sphinx_book_theme/assets/styles/content/_margin.scss
@@ -29,6 +29,7 @@ $margin-offset: -$margin-width-relative-to-content;
   float: right;
   background-color: unset;
   font-size: 0.9em;
+  margin-left: 0.5rem;
 
   // This is the wide-screen behavior
   @media (min-width: $breakpoint-lg) {
@@ -119,7 +120,8 @@ aside.sidebar {
 }
 
 /**
- * Block-level margin content
+ * Sidebar content in the margin.
+ * This will be added by the `margin` directive or the `sidebar` directive
  */
 aside.sidebar.margin {
   // Margin content can have an empty title so this prevents an empty title block
diff --git a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
index bd0fdbf1..53a0b5be 100644
--- a/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
+++ b/src/sphinx_book_theme/assets/styles/sections/_header-article.scss
@@ -137,3 +137,13 @@ div.header-article-main {
     }
   }
 }
+
+/**
+ * Tooltips added by bootstrap
+ * These are added to the bottom of the `<body>` block by JavaScript.
+ * We should consider removing custom tooltips as this is pretty hacky...
+ */
+// Ensure that tooltips are *below* the sidebar toggles on mobile
+div.tooltip {
+  z-index: 1049;
+}