Merge pull request #61 from QuLogic/announce-360

timhoffm · web-flow · commit 80dd51dd1af3 · 2022-09-21T00:28:31.000+02:00
Announce 3.6.0 and update theme
diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
@@ -3,17 +3,36 @@
 {%- import "static/webpack-macros.html" as _webpack with context %}
 
 {% block body_tag %}
-  <body data-spy="scroll" data-target="#bd-toc-nav" data-offset="80">
-    <div class="document">
+  {{- super() }}
+  <div class="document">
 {%- endblock %}
 {%- block content %}
-    {# Added to support a banner with an alert #}
-    <div class="container-fluid" id="banner"></div>
+  {# checkbox to toggle primary sidebar #}
+  <input type="checkbox" class="sidebar-toggle" name="__primary" id="__primary">
+  <label class="overlay overlay-primary" for="__primary"></label>
 
-    {% block docs_navbar %}{{ super() }}{% endblock %}
-    <main role="main">
-      {% block body %} {% endblock %}
-    </main>
+  {# Checkboxes to toggle the secondary sidebar #}
+  <input type="checkbox" class="sidebar-toggle" name="__secondary" id="__secondary">
+  <label class="overlay overlay-secondary" for="__secondary"></label>
+
+  {# A search field pop-up that will only show when the search button is clicked #}
+  <div class="search-button__wrapper">
+    <div class="search-button__overlay"></div>
+    <div class="search-button__search-container">
+      {% include "../components/search-field.html" %}
+    </div>
+  </div>
+
+  {%- if theme_announcement -%}
+  <div class="bd-header-announcement container-fluid" id="header-announcement">
+    {% include "sections/announcement.html" %}
+  </div>
+  {%- endif %}
+
+  {% block docs_navbar %}{{ super() }}{% endblock %}
+  <main role="main">
+    {% block body %} {% endblock %}
+  </main>
 
   {%- block scripts_end %}{{ super() }}{%- endblock %}
 {%- endblock %}
diff --git a/docs/body.html b/docs/body.html
@@ -121,6 +121,11 @@ <h1>Matplotlib: Visualization with Python</h1>
           <!-- optional important news -->
           <h3>News</h3>
           <div class="news__item--highlight">
+            <h5 class="date">September 16, 2022</h5>
+            <a href="https://discourse.matplotlib.org/t/matplotlib-announce-ann-matplotlib-3-6-0/23129" class="link--offsite">Matplotlib 3.6.0 Released</a>
+          </div>
+
+          <div class="news__item">
             <h5 class="date">May 2, 2022</h5>
             <a href="https://discourse.matplotlib.org/t/matplotlib-announce-ann-matplotlib-3-5-2/22805" class="link--offsite">Matplotlib 3.5.2 Released</a>
           </div>
diff --git a/docs/conf.py b/docs/conf.py
@@ -36,8 +36,12 @@
 html_theme = "mpl_sphinx_theme"
 html_favicon = "_static/favicon.ico"
 html_theme_options = {
-    "logo_link": "https://matplotlib.org/stable/",
-    "native_site": False,
+    "logo": {
+        "link": "https://matplotlib.org/stable/",
+        "image_light": "images/logo2.svg",
+        "image_dark": "images/logo_dark.svg",
+    },
+    "navbar_links": "server-stable",
     "footer_items": ["landing_footer"],
 }
 
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 jinja2>3
-pydata-sphinx-theme<0.9.0
-mpl-sphinx-theme
+mpl-sphinx-theme~=3.6.0
+pygments>=2.7
 sphinx
 sphinx-notfound-page
