From bf801afef836ed81394d2522efc64605dd2cf1da Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 2 Mar 2021 16:49:23 +0100
Subject: [PATCH] docs: Move custom.css into the main css

There's no real separation here so one file is preferable.

We'll leave the pygments.css intact because that handles a different thing
---
 doc_src/_static/custom.css                    | 27 ------------------
 doc_src/conf.py                               |  6 ----
 .../python_docs_theme/static/pydoctheme.css   | 28 +++++++++++++++++++
 3 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 doc_src/_static/custom.css

diff --git a/doc_src/_static/custom.css b/doc_src/_static/custom.css
deleted file mode 100644
index 7b3b57d03..000000000
--- a/doc_src/_static/custom.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.sphinxsidebar ul.current > li.current { font-weight: bold }
-
-.gray { color: #555555 }
-.purple { color: #551a8b }
-.red { color: #FF0000 }
-
-/* Color based on the Name.Function (.nf) class from pygments.css. */
-.command { color: #005fd7 }
-
-/* Color based on the Name.Constant (.no) class from pygments.css. */
-.param { color: #00afff }
-
-/* Color based on the Name.Constant (.no) class from pygments.css. */
-/* Used for underlining file paths in interactive code examples. */
-.param-valid-path { color: #00afff; text-decoration: underline }
-
-/* Color based on the Generic.Prompt (.gp) class from pygments.css. */
-.prompt { color: #8f5902 }
-
-kbd {
-  background-color: #f9f9f9;
-  border: 1px solid #aaa;
-  border-radius: .2em;
-  box-shadow: 0.1em 0.1em 0.2em rgba(0,0,0,0.1);
-  color: #000;
-  padding: 0.1em 0.3em;
-}
diff --git a/doc_src/conf.py b/doc_src/conf.py
index 8a0f6f18f..78cc66a99 100644
--- a/doc_src/conf.py
+++ b/doc_src/conf.py
@@ -52,12 +52,6 @@ def setup(app):
     )
     lexers["fish-docs-samples"] = fish_indent_lexer
 
-    # add_css_file only appears in Sphinx 1.8.0
-    if hasattr(app, "add_css_file"):
-        app.add_css_file("custom.css")
-    else:
-        app.add_stylesheet("custom.css")
-
     app.add_config_value("issue_url", default=None, rebuild="html")
     app.add_role("issue", issue_role)
 
diff --git a/doc_src/python_docs_theme/static/pydoctheme.css b/doc_src/python_docs_theme/static/pydoctheme.css
index 445c69b0b..62b2eb7eb 100644
--- a/doc_src/python_docs_theme/static/pydoctheme.css
+++ b/doc_src/python_docs_theme/static/pydoctheme.css
@@ -276,3 +276,31 @@ dl > dt span ~ em {
         margin: 0;
     }
 }
+
+.sphinxsidebar ul.current > li.current { font-weight: bold }
+
+.gray { color: #555555 }
+.purple { color: #551a8b }
+.red { color: #FF0000 }
+
+/* Color based on the Name.Function (.nf) class from pygments.css. */
+.command { color: #005fd7 }
+
+/* Color based on the Name.Constant (.no) class from pygments.css. */
+.param { color: #00afff }
+
+/* Color based on the Name.Constant (.no) class from pygments.css. */
+/* Used for underlining file paths in interactive code examples. */
+.param-valid-path { color: #00afff; text-decoration: underline }
+
+/* Color based on the Generic.Prompt (.gp) class from pygments.css. */
+.prompt { color: #8f5902 }
+
+kbd {
+  background-color: #f9f9f9;
+  border: 1px solid #aaa;
+  border-radius: .2em;
+  box-shadow: 0.1em 0.1em 0.2em rgba(0,0,0,0.1);
+  color: #000;
+  padding: 0.1em 0.3em;
+}