aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore26
-rw-r--r--docs/conf.py9
2 files changed, 22 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore
index fccb75c0e..c7a8ad416 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,13 @@
-/build
-/dist
-/pyside_build
-/pyside_package
-/pyside_install
-/PySide
-/PySide-*.*.*
-/SciTE.*
-/pysideuic
-*.egg-info
-*.pyc
-distribute-*.egg
-distribute-*.tar.gz
+/build
+/dist
+/pyside_build
+/pyside_package
+/pyside_install
+/PySide
+/PySide-*.*.*
+/SciTE.*
+/pysideuic
+*.egg-info
+*.pyc
+distribute-*.egg
+distribute-*.tar.gz
diff --git a/docs/conf.py b/docs/conf.py
index c92de2e92..0af22dbcb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -108,6 +108,15 @@ html_theme = 'default'
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = []
+# on_rtd is whether we are on readthedocs.org
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
+if not on_rtd:
+ # only import and set the theme if we're building docs locally
+ import sphinx_rtd_theme
+ html_theme = 'sphinx_rtd_theme'
+ html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None