scikit-learn · jnothman · Sep 21, 2019 · Aug 29, 2019 · Aug 29, 2019 · Aug 29, 2019
diff --git a/doc/conf.py b/doc/conf.py
@@ -52,9 +52,8 @@
     imgmath_image_format = 'svg'
 else:
     extensions.append('sphinx.ext.mathjax')
-    mathjax_path = ('https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/'
-                    'MathJax.js?config=TeX-AMS_SVG')
-
+    mathjax_path = ('https://cdn.jsdelivr.net/npm/mathjax@3/es5/'
+                    'tex-chtml.js')
 
 autodoc_default_options = {
     'members': True,
@@ -74,7 +73,7 @@
 #source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = 'contents'
 
 # General information about the project.
 project = 'scikit-learn'
@@ -130,14 +129,13 @@
 
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'scikit-learn'
+html_theme = 'scikit-learn-modern'
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = {'oldversion': False, 'collapsiblesidebar': True,
-                      'google_analytics': True, 'surveybanner': False,
-                      'sprintbanner': True, 'body_max_width': None}
+html_theme_options = {'google_analytics': True,
+                      'mathjax_path': mathjax_path}
 
 # Add any paths that contain custom themes here, relative to this directory.
 html_theme_path = ['themes']
@@ -173,7 +171,8 @@
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+html_additional_pages = {'index': 'index.html',
+                         'documentation': 'documentation.html'}
 
 # If false, no module index is generated.
 html_domain_indices = False
@@ -217,7 +216,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass
 # [howto/manual]).
-latex_documents = [('index', 'user_guide.tex', 'scikit-learn user guide',
+latex_documents = [('contents', 'user_guide.tex', 'scikit-learn user guide',
                     'scikit-learn developers', 'manual'), ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -279,11 +278,7 @@
 # thumbnails for the front page of the scikit-learn home page.
 # key: first image in set
 # values: (number of plot in set, height of thumbnail)
-carousel_thumbs = {'sphx_glr_plot_classifier_comparison_001.png': 600,
-                   'sphx_glr_plot_anomaly_comparison_001.png': 372,
-                   'sphx_glr_plot_gpr_co2_001.png': 350,
-                   'sphx_glr_plot_adaboost_twoclass_001.png': 372,
-                   'sphx_glr_plot_compare_methods_001.png': 349}
+carousel_thumbs = {'sphx_glr_plot_classifier_comparison_001.png': 600}
 
 
 # enable experimental module so that experimental estimators can be
@@ -314,8 +309,6 @@ def make_carousel_thumbs(app, exception):
 
 def setup(app):
     # to hide/show the prompt in code examples:
-    app.add_javascript('js/copybutton.js')
-    app.add_javascript('js/extra.js')
     app.connect('build-finished', make_carousel_thumbs)
 
 

diff --git a/doc/contents.rst b/doc/contents.rst
@@ -0,0 +1,23 @@
+.. include:: includes/big_toc_css.rst
+.. include:: tune_toc.rst
+
+.. Places global toc into the sidebar
+:globalsidebartoc: True
+
+=================
+Table Of Contents
+=================
+
+.. Define an order for the Table of Contents:
+
+.. toctree::
+    :maxdepth: 2
+
+    preface
+    tutorial/index
+    getting_started
+    user_guide
+    glossary
+    auto_examples/index
+    modules/classes
+    developers/index
diff --git a/doc/data_transforms.rst b/doc/data_transforms.rst
@@ -24,6 +24,7 @@ transformations of the target space (e.g. categorical labels) for use in
 scikit-learn.
 
 .. toctree::
+    :maxdepth: 2
 
     modules/compose
     modules/feature_extraction

diff --git a/doc/developers/index.rst b/doc/developers/index.rst
@@ -1,3 +1,6 @@
+.. Places global toc into the sidebar
+:globalsidebartoc: True
+
 .. _developers_guide:
 
 =================

diff --git a/doc/documentation.rst b/doc/documentation.rst
diff --git a/doc/images/columbia-small.png b/doc/images/columbia-small.png
diff --git a/doc/images/fnrs-logo-small.png b/doc/images/fnrs-logo-small.png
diff --git a/doc/images/google-small.png b/doc/images/google-small.png
diff --git a/doc/images/inria-small.png b/doc/images/inria-small.png
diff --git a/doc/images/scikit-learn-logo-small.png b/doc/images/scikit-learn-logo-small.png
diff --git a/doc/images/sloan_logo-small.png b/doc/images/sloan_logo-small.png
diff --git a/doc/images/sydney-stacked-small.png b/doc/images/sydney-stacked-small.png
diff --git a/doc/images/telecom-small.png b/doc/images/telecom-small.png
diff --git a/doc/includes/big_toc_css.rst b/doc/includes/big_toc_css.rst
@@ -5,38 +5,34 @@
 .. raw:: html
 
   <style type="text/css">
-    div.bodywrapper blockquote {
-        margin: 0 ;
+    div.body div.toctree-wrapper ul {
+        padding-left: 0;
     }
 
-    div.toctree-wrapper ul {
-	margin-top: 0 ;
-	margin-bottom: 0 ;
-	padding-left: 10px ;
-    }
-
-    li.toctree-l1 {
-        padding: 0 0 0.5em 0 ;
+    div.body li.toctree-l1 {
+        padding: 0 0 0.5em 0;
         list-style-type: none;
-        font-size: 150% ;
-	font-weight: bold;
-        }
-
-    li.toctree-l1 ul {
-	padding-left: 40px ;
+        font-size: 150%;
+        font-weight: bold;
     }
 
-    li.toctree-l2 {
-        font-size: 70% ;
+    div.body li.toctree-l2 {
+        font-size: 70%;
         list-style-type: square;
-	font-weight: normal;
-        }
+        font-weight: normal;
+        margin-left: 40px;
+    }
 
-    li.toctree-l3 {
-        font-size: 85% ;
+    div.body li.toctree-l3 {
+        font-size: 85%;
         list-style-type: circle;
-	font-weight: normal;
-        }
+        font-weight: normal;
+        margin-left: 40px;
+    }
+
+    div.body li.toctree-l4 {
+        margin-left: 40px;
+    }
 
   </style>