[ci skip] Merge branch 'master' into develop

COMBINE-lab · May 12, 2021 · e88f3b4 · e88f3b4
2 parents 8485624 + c707902
commit e88f3b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/doc/logo.png b/doc/logo.png
diff --git a/doc/requirements.txt b/doc/requirements.txt
@@ -0,0 +1,5 @@
+#######
+#
+###### Custom themes (no version specifiers) ######
+furo
+
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -102,9 +102,14 @@
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-import sphinx_rtd_theme
-html_theme = "sphinx_rtd_theme"
-html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+#import sphinx_rtd_theme
+#html_theme = "sphinx_rtd_theme"
+#html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
+html_theme = 'furo'
+html_logo = '../logo.png'
+
 #html_theme = 'classic'
 
 # Theme options are theme-specific and customize the look and feel of a theme