Merge branch 'develop' into mat_redesign

idaholab · Sep 24, 2024 · e5ccf65 · e5ccf65
2 parents 37e5ce3 + c529c66
commit e5ccf65
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ dist/*
 *.prof
 doc/build/*
 .coverage
+.hypothesis/
 .idea/
 .ipynb_checkpoints/
 montepy/_version.py

diff --git a/doc/source/_static/monty-192.png b/doc/source/_static/monty-192.png
@@ -0,0 +1 @@
+../../../graphics/monty-192.png
diff --git a/doc/source/_static/monty-32.ico b/doc/source/_static/monty-32.ico
@@ -0,0 +1 @@
+../../../graphics/monty-32.ico
diff --git a/doc/source/_static/monty-32.png b/doc/source/_static/monty-32.png
@@ -0,0 +1 @@
+../../../graphics/monty-32.png
diff --git a/doc/source/_static/monty.svg b/doc/source/_static/monty.svg
@@ -0,0 +1 @@
+../../../graphics/monty.svg
diff --git a/doc/source/_static/placeholder b/doc/source/_static/placeholder
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -37,11 +37,17 @@
     "sphinx.ext.intersphinx",
     "sphinx.ext.extlinks",
     "sphinx_sitemap",
+    "sphinx_favicon",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
-html_favicon = "monty.svg"
+favicons = [
+    "monty.svg",
+    "monty-192.png",
+    "monty-32.png",
+    "monty-32.ico",
+]
 html_logo = "monty.svg"
 
 html_baseurl = "https://www.montepy.org/"

diff --git a/graphics/monty-192.png b/graphics/monty-192.png
diff --git a/graphics/monty-32.ico b/graphics/monty-32.ico
diff --git a/graphics/monty-32.png b/graphics/monty-32.png
diff --git a/pyproject.toml b/pyproject.toml
@@ -46,7 +46,8 @@ doc = [
 	"sphinx>=7.4.0", 
 	"sphinxcontrib-apidoc", 
 	"sphinx_rtd_theme",
-	"sphinx-sitemap"
+	"sphinx-sitemap",
+	"sphinx-favicon",
 ]
 format = ["black>=23.3.0"]
 build = [