matplotlib · tacaswell · Jun 21, 2021 · Mar 18, 2021 · QuLogic · Jun 19, 2021
diff --git a/doc/_static/fonts/Carlogo-bold.ttf b/doc/_static/fonts/Carlogo-bold.ttf
diff --git a/doc/_static/fonts/Carlogo-bolditalic.ttf b/doc/_static/fonts/Carlogo-bolditalic.ttf
diff --git a/doc/_static/fonts/Carlogo-italic.ttf b/doc/_static/fonts/Carlogo-italic.ttf
diff --git a/doc/_static/fonts/Carlogo-regular.ttf b/doc/_static/fonts/Carlogo-regular.ttf
diff --git a/doc/_static/fonts/carlogo-bold.woff b/doc/_static/fonts/carlogo-bold.woff
diff --git a/doc/_static/fonts/carlogo-bold.woff2 b/doc/_static/fonts/carlogo-bold.woff2
diff --git a/doc/_static/fonts/carlogo-bolditalic.woff b/doc/_static/fonts/carlogo-bolditalic.woff
diff --git a/doc/_static/fonts/carlogo-bolditalic.woff2 b/doc/_static/fonts/carlogo-bolditalic.woff2
diff --git a/doc/_static/fonts/carlogo-italic.woff b/doc/_static/fonts/carlogo-italic.woff
diff --git a/doc/_static/fonts/carlogo-italic.woff2 b/doc/_static/fonts/carlogo-italic.woff2
diff --git a/doc/_static/fonts/carlogo-regular.woff b/doc/_static/fonts/carlogo-regular.woff
diff --git a/doc/_static/fonts/carlogo-regular.woff2 b/doc/_static/fonts/carlogo-regular.woff2
diff --git a/doc/_static/mpl.css b/doc/_static/mpl.css
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
diff --git a/doc/api/index.rst b/doc/api/index.rst
@@ -1,5 +1,5 @@
-API
-===
+Reference
+=========
 
 When using the library you will typically create
 :doc:`Figure <figure_api>` and :doc:`Axes <axes_api>` objects and

diff --git a/doc/conf.py b/doc/conf.py
@@ -104,6 +104,7 @@ def _check_dependencies():
 # gallery_order.py from the sphinxext folder provides the classes that
 # allow custom ordering of sections and subsections of the gallery
 import sphinxext.gallery_order as gallery_order
+
 # The following import is only necessary to monkey patch the signature later on
 from sphinx_gallery import gen_rst
 
@@ -205,10 +206,7 @@ def _check_dependencies():
     SHA = matplotlib.__version__
 
 html_context = {
-    'sha': SHA,
-    # This will disable any analytics in the HTML templates (currently Google
-    # Analytics.)
-    'include_analytics': False,
+    "sha": SHA,
 }
 
 project = 'Matplotlib'
@@ -266,15 +264,45 @@ def _check_dependencies():
 # The style sheet to use for HTML and HTML Help pages. A file of that name
 # must exist either in Sphinx' static/ path, or in one of the custom paths
 # given in html_static_path.
-html_style = f'mpl.css?{SHA}'
+# html_style = 'matplotlib.css'
+# html_style = f"mpl.css?{SHA}"
+html_css_files = [
+    f"mpl.css?{SHA}",
+]
+
+html_theme = "pydata_sphinx_theme"
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
 # html_title = None
 
 # The name of an image file (within the static path) to place at the top of
 # the sidebar.
-# html_logo = 'logo.png'
+html_logo = "_static/logo2.svg"
+html_theme_options = {
+    "logo_link": "index.html",
+    "icon_links": [
+        {
+            "name": "gitter",
+            "url": "https://gitter.im/matplotlib",
+            "icon": "fab fa-gitter",
+        },
+        {
+            "name": "discourse",
+            "url": "https://discourse.matplotlib.org",
+            "icon": "fab fa-discourse",
+        },
+        {
+            "name": "GitHub",
+            "url": "https://github.com/matplotlib/matplotlib",
+            "icon": "fab fa-github-square",
+        },
+
+    ],
+}
+include_analytics = False
+if include_analytics:
+    html_theme_options["google_analytics_id"] = "UA-55954603-1"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -297,11 +325,12 @@ def _check_dependencies():
 
 # Custom sidebar templates, maps page names to templates.
 html_sidebars = {
-    'index': [
+    "index": [
         # 'sidebar_announcement.html',
-        'sidebar_versions.html',
-        'donate_sidebar.html'],
-    '**': ['localtoc.html', 'pagesource.html']
+        "sidebar_versions.html",
+        "donate_sidebar.html",
+    ],
+    # '**': ['localtoc.html', 'pagesource.html']
 }
 
 # If false, no module index is generated.

diff --git a/doc/contents.rst b/doc/contents.rst
@@ -1,6 +1,6 @@
 
 
-Overview
+Contents
 ========
 
 .. only:: html
@@ -14,12 +14,14 @@ Overview
 .. toctree::
    :maxdepth: 2
 
-   users/index.rst
-   faq/index.rst
+   users/installing.rst
+   plot_types/index.rst
+   gallery/index.rst
+   tutorials/index.rst
    api/index.rst
-   resources/index.rst
-   Third-party packages <https://matplotlib.org/mpl-third-party/>
+   users/index.rst
    devel/index.rst
+   Third-party packages <https://matplotlib.org/mpl-third-party/>
 
 .. only:: html
 

diff --git a/doc/devel/contributing.rst b/doc/devel/contributing.rst
@@ -78,6 +78,8 @@ use to organize this information.
 
 Thank you for your help in keeping bug reports complete, targeted and descriptive.
 
+.. _request-a-new-feature:
+
 Requesting a new feature
 ========================
 

diff --git a/doc/devel/documenting_mpl.rst b/doc/devel/documenting_mpl.rst
@@ -4,13 +4,6 @@
 Writing documentation
 =====================
 
-.. contents:: Contents
-   :depth: 3
-   :local:
-   :backlinks: top
-   :class: multicol-toc
-
-
 Getting started
 ===============
 
@@ -290,7 +283,7 @@ Including figures and files
 ---------------------------
 
 Image files can directly included in pages with the ``image::`` directive.
-e.g., :file:`tutorials/intermediate/constrainedlayout_guide.py` displays 
+e.g., :file:`tutorials/intermediate/constrainedlayout_guide.py` displays
 a couple of static images::
 
   # .. image:: /_static/constrained_layout_1b.png

diff --git a/doc/devel/index.rst b/doc/devel/index.rst
@@ -1,8 +1,8 @@
 .. _developers-guide-index:
 
-################################
-The Matplotlib Developers' Guide
-################################
+############
+Contributing
+############
 
 Thank you for your interest in helping to improve Matplotlib! There are various
 ways to contribute to Matplotlib. All of them are super valuable but don't necessarily

diff --git a/doc/users/index.rst b/doc/users/index.rst
@@ -12,11 +12,11 @@ User's Guide
 .. toctree::
     :maxdepth: 2
 
-    installing.rst
-    ../tutorials/index.rst
     interactive.rst
     release_notes.rst
-    history.rst
     license.rst
     ../citing.rst
+    ../resources/index.rst
+    ../faq/index.rst
     credits.rst
+    history.rst
diff --git a/requirements/doc/doc-requirements.txt b/requirements/doc/doc-requirements.txt
@@ -12,6 +12,7 @@ colorspacious
 ipython
 ipywidgets
 numpydoc>=0.8
+pydata-sphinx-theme>=0.5.0
 sphinxcontrib-svg2pdfconverter>=1.1.0
 # sphinx-gallery>=0.7   
 # b41e328 is PR 808 which adds the image_srcset directive.  When this is