Merge pull request python-trio#149 from njsmith/update-logo-urls

Update logo URLs to point to a commit that should exist in the long term, plus other minor followups to python-trio#148
njsmith · May 7, 2017 · 1aed71d · 1aed71d
2 parents 9b0bec6 + 246d07e
commit 1aed71d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/README.rst b/README.rst
@@ -29,7 +29,7 @@ Trio – async I/O for humans and snake people
    ignores the width and align directives, so it's actually pretty
    useless...
 
-.. image:: https://cdn.rawgit.com/njsmith/trio/7e521a7bdc89bdb18c2b8f7ba1571ebac1203d42/logo/logo-with-background.svg
+.. image:: https://cdn.rawgit.com/python-trio/trio/9b0bec646a31e0d0f67b8b6ecc6939726faf3e17/logo/logo-with-background.svg
    :width: 200px
    :align: right
 

diff --git a/docs/source/_static/hackrtd.css b/docs/source/_static/hackrtd.css
@@ -7,8 +7,11 @@ pre {
 
 /* Add a snakey triskelion ornament to <hr>
  * https://stackoverflow.com/questions/8862344/css-hr-with-ornament/18541258#18541258
+ * but only do it to <hr>s in the content box, b/c the RTD popup control panel
+ * thingummy also has an <hr> in it, and putting the ornament on that looks
+ * *really weird*. (In particular, the background color is wrong.)
  */
-hr:after {
+.rst-content hr:after {
     /* This .svg gets displayed on top of the middle of the hrule. It has a box
      * behind the logo that's colored to match the RTD theme body background
      * color (#fcfcfc), which hides the middle part of the hrule to make it

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -187,13 +187,12 @@ def getargspec(func):
 #
 #html_theme = 'alabaster'
 
-# Stolen from https://quick-sphinx-tutorial.readthedocs.io/en/latest/advanced.html
-if "READTHEDOCS" in os.environ:
-    html_theme = 'default'
-else:
-    import sphinx_rtd_theme
-    html_theme = 'sphinx_rtd_theme'
-    html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+# We have to set this ourselves, not only because it's useful for local
+# testing, but also because if we don't then RTD will throw away our
+# html_theme_options.
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 
 # 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

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 exec(open("trio/_version.py", encoding="utf-8").read())
 
 LONG_DESC = """\
-.. image:: https://cdn.rawgit.com/njsmith/trio/7e521a7bdc89bdb18c2b8f7ba1571ebac1203d42/logo/logo-with-background.svg
+.. image:: https://cdn.rawgit.com/python-trio/trio/9b0bec646a31e0d0f67b8b6ecc6939726faf3e17/logo/logo-with-background.svg
    :width: 200px
    :align: right