Merge pull request #191 from agjohnson/sphinx-1.3-compat

Sphinx 1.3 compat
readthedocs · Apr 23, 2015 · a61976a · a61976a
2 parents af82c93 + c4c681b
commit a61976a
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/demo_docs/source/api.rst b/demo_docs/source/api.rst
@@ -0,0 +1,7 @@
+:mod:`test_py_module`
+=====================
+
+.. automodule:: test_py_module.test
+    :members:
+    :private-members:
+    :special-members:
diff --git a/demo_docs/source/index.rst b/demo_docs/source/index.rst
@@ -24,6 +24,7 @@ Contents:
     :caption: This is an incredibly long caption for a long menu
 
     long
+    api
 
 Maaaaath!
 =========
@@ -57,14 +58,6 @@ Giant tables
 | body row 1 | column 2   | column 3  | body row 1 | column 2   | column 3  | body row 1 | column 2   | column 3  | body row 1 | column 2   | column 3  |
 +------------+------------+-----------+------------+------------+-----------+------------+------------+-----------+------------+------------+-----------+
 
-API Test
-========
-
-.. automodule:: test_py_module.test
-    :members:
-    :private-members:
-    :special-members:
-
 Optional parameter args
 -----------------------
 

diff --git a/demo_docs/source/test_py_module/test.py b/demo_docs/source/test_py_module/test.py
@@ -26,6 +26,10 @@ class Foo:
 
         print(myclass)
 
+
+    Here is a link to :py:meth:`capitalize`.
+    Here is a link to :py:meth:`__init__`.
+
     """
 
     #: Doc comment for class attribute Foo.bar.

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-sphinx>=1.1
+sphinx>=1.3
diff --git a/sass/_theme_layout.sass b/sass/_theme_layout.sass
@@ -52,6 +52,12 @@
         padding: $gutter / 4 $gutter * 1.5
         &:hover
           background: darken($section-background-color, 15%)
+    code
+      border: none
+      background: inherit
+      color: inherit
+      padding-left: 0
+      padding-right: 0
   // On state for the first level
   li.on a, li.current > a
     color: $text-color

diff --git a/sass/_theme_rst.sass b/sass/_theme_rst.sass
@@ -196,7 +196,7 @@
     .xref, a &
       font-weight: bold
   // If the literal is inside an a tag, let's color it like a link
-  a tt
+  a tt, a code
     color: $link-color
   dl
     margin-bottom: $base-line-height

diff --git a/sphinx_rtd_theme/static/css/theme.css b/sphinx_rtd_theme/static/css/theme.css
diff --git a/sphinx_rtd_theme/static/css/theme.css.map b/sphinx_rtd_theme/static/css/theme.css.map