Merge branch 'master' into fix-pygments

Author: Blendify

README.rst

@@ -9,6 +9,14 @@
 .. _demo: http://docs.readthedocs.org
 .. _hidden: http://sphinx-doc.org/markup/toctree.html
 
+.. image:: https://img.shields.io/pypi/v/sphinx_rtd_theme.svg
+   :target: https://pypi.python.org/pypi/sphinx_rtd_theme
+.. image:: https://travis-ci.org/rtfd/sphinx_rtd_theme.svg?branch=master
+   :target: https://travis-ci.org/rtfd/sphinx_rtd_theme
+.. image:: https://img.shields.io/pypi/l/sphinx_rtd_theme.svg
+   :target: https://pypi.python.org/pypi/sphinx_rtd_theme/
+   :alt: license
+
 **************************
 Read the Docs Sphinx Theme
 **************************

js/theme.js

@@ -108,13 +108,15 @@ function ThemeNav () {
                   // Try again with the closest section entry.
                   link = $('.wy-menu-vertical')
                     .find('[href="#' + closest_section.attr("id") + '"]');
-
                 }
-                $('.wy-menu-vertical li.toctree-l1 li.current')
-                    .removeClass('current');
-                link.closest('li.toctree-l2').addClass('current');
-                link.closest('li.toctree-l3').addClass('current');
-                link.closest('li.toctree-l4').addClass('current');
+                // If we found a matching link then reset current and re-apply
+                // otherwise retain the existing match
+                if (link.length > 0) {
+                    $('.wy-menu-vertical li.toctree-l1 li.current').removeClass('current');
+                    link.closest('li.toctree-l2').addClass('current');
+                    link.closest('li.toctree-l3').addClass('current');
+                    link.closest('li.toctree-l4').addClass('current');
+                }
             }
             catch (err) {
                 console.log("Error expanding nav for anchor", err);

sass/_theme_rst.sass

@@ -50,7 +50,7 @@
   .literal-block, pre.literal-block
     @extend .codeblock
   // These are the various note pullouts that sphinx applies
-  .note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo
+  .note, .attention, .caution, .danger, .error, .hint, .important, .tip, .warning, .seealso, .admonition-todo, .admonition
     @extend .wy-alert
     .last
       margin-bottom: 0
@@ -119,7 +119,7 @@
         display: inline-block
     &:hover .headerlink
       display: inline-block
-  
+
   .centered
     text-align: center
 

setup.py

@@ -4,6 +4,7 @@
 .. _github: https://www.github.com/snide/sphinx_rtd_theme
 
 """
+from io import open
 from setuptools import setup
 from sphinx_rtd_theme import __version__
 
@@ -16,7 +17,7 @@
     author='Dave Snider',
     author_email='[email protected]',
     description='Read the Docs theme for Sphinx',
-    long_description=open('README.rst').read(),
+    long_description=open('README.rst', encoding='utf-8').read(),
     zip_safe=False,
     packages=['sphinx_rtd_theme'],
     package_data={'sphinx_rtd_theme': [
@@ -34,6 +35,8 @@
         ]
     },
     classifiers=[
+        'Framework :: Sphinx',
+        'Framework :: Sphinx :: Theme',
         'Development Status :: 5 - Production/Stable',
         'License :: OSI Approved :: MIT License',
         'Environment :: Console',

sphinx_rtd_theme/__init__.py

@@ -3,13 +3,17 @@
 From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
 
 """
-import os
+from os import path
 
 __version__ = '0.2.5b1'
 __version_full__ = __version__
 
 
 def get_html_theme_path():
     """Return list of HTML theme paths."""
-    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+    cur_dir = path.abspath(path.dirname(path.dirname(__file__)))
     return cur_dir
+
+# See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
+def setup(app):
+    app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))

sphinx_rtd_theme/static/css/theme.css

@@ -109,13 +109,15 @@ function ThemeNav () {
                   // Try again with the closest section entry.
                   link = $('.wy-menu-vertical')
                     .find('[href="#' + closest_section.attr("id") + '"]');
-
                 }
-                $('.wy-menu-vertical li.toctree-l1 li.current')
-                    .removeClass('current');
-                link.closest('li.toctree-l2').addClass('current');
-                link.closest('li.toctree-l3').addClass('current');
-                link.closest('li.toctree-l4').addClass('current');
+                // If we found a matching link then reset current and re-apply
+                // otherwise retain the existing match
+                if (link.length > 0) {
+                    $('.wy-menu-vertical li.toctree-l1 li.current').removeClass('current');
+                    link.closest('li.toctree-l2').addClass('current');
+                    link.closest('li.toctree-l3').addClass('current');
+                    link.closest('li.toctree-l4').addClass('current');
+                }
             }
             catch (err) {
                 console.log("Error expanding nav for anchor", err);