Merge pull request #1500 from rtfd/update-sphinx-theme

Update integrated sphinx_rtd_theme

Author: ericholscher

media/css/sphinx_rtd_theme.css

@@ -22,9 +22,23 @@
       {%- endif %}
     {%- endif %}
 
-    {%- if last_updated %}
+    {%- if build_id and build_url %}
+      {% trans build_url=build_url, build_id=build_id %}
+        <span class="build">
+          Build
+          <a href="{{ build_url }}">{{ build_id }}</a>.
+        </span>
+      {% endtrans %}
+    {%- elif commit %}
+      {% trans commit=commit %}
+        <span class="commit">
+          Revision <code>{{ commit }}</code>.
+        </span>
+      {% endtrans %}
+    {%- elif last_updated %}
       {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
     {%- endif %}
+
     </p>
   </div>
 

media/font/fonts/FontAwesome.otf

@@ -75,7 +75,7 @@
   {%- block extrahead %} {% endblock %}
 
   {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
-  <script src="_static/js/modernizr.min.js"></script>
+  <script src="{{ pathto('_static/js/modernizr.min.js', 1) }}"></script>
 
 </head>
 
@@ -100,14 +100,26 @@
         {% endif %}
         </a>
 
+        {% if theme_display_version %}
+          {%- set nav_version = version %}
+          {% if READTHEDOCS and current_version %}
+            {%- set nav_version = current_version %}
+          {% endif %}
+          {% if nav_version %}
+            <div class="version">
+              {{ nav_version }}
+            </div>
+          {% endif %}
+        {% endif %}
+
         {% include "searchbox.html" %}
 
         {% endblock %}
       </div>
 
       <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
         {% block menu %}
-          {% set toctree = toctree(maxdepth=4, collapse=False, includehidden=True) %}
+          {% set toctree = toctree(maxdepth=4, collapse=theme_collapse_navigation, includehidden=True) %}
           {% if toctree %}
               {{ toctree }}
           {% else %}
@@ -132,8 +144,10 @@
       <div class="wy-nav-content">
         <div class="rst-content">
           {% include "breadcrumbs.html" %}
-          <div role="main" class="document">
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+           <div itemprop="articleBody">
             {% block body %}{% endblock %}
+           </div>
           </div>
           {% include "footer.html" %}
         </div>

media/font/fonts/Inconsolata-Bold.ttf

@@ -31,7 +31,7 @@ $(document).ready(function() {
     $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
 
     // Add expand links to all parents of nested ul
-    $('.wy-menu-vertical ul').siblings('a').each(function () {
+    $('.wy-menu-vertical ul').not('.simple').siblings('a').each(function () {
         var link = $(this);
             expand = $('<span class="toctree-expand"></span>');
         expand.on('click', function (ev) {
@@ -49,29 +49,30 @@ window.SphinxRtdTheme = (function (jquery) {
         var navBar,
             win,
             winScroll = false,
+            winResize = false,
             linkScroll = false,
             winPosition = 0,
+            winHeight,
+            docHeight,
             enable = function () {
                 init();
                 reset();
                 win.on('hashchange', reset);
 
-                // Set scrolling
+                // Set scroll monitor
                 win.on('scroll', function () {
                     if (!linkScroll) {
                         winScroll = true;
                     }
                 });
-                setInterval(function () {
-                    if (winScroll) {
-                        winScroll = false;
-                        var newWinPosition = win.scrollTop(),
-                            navPosition = navBar.scrollTop(),
-                            newNavPosition = navPosition + (newWinPosition - winPosition);
-                        navBar.scrollTop(newNavPosition);
-                        winPosition = newWinPosition;
-                    }
-                }, 25);
+                setInterval(function () { if (winScroll) scroll(); }, 25);
+
+                // Set resize monitor
+                win.on('resize', function () {
+                    winResize = true;
+                });
+                setInterval(function () { if (winResize) resize(); }, 25);
+                resize();
             },
             init = function () {
                 navBar = jquery('nav.wy-nav-side:first');
@@ -95,6 +96,23 @@ window.SphinxRtdTheme = (function (jquery) {
                     }
                 }
             },
+            scroll = function () {
+                winScroll = false;
+                var newWinPosition = win.scrollTop(),
+                    winBottom = newWinPosition + winHeight,
+                    navPosition = navBar.scrollTop(),
+                    newNavPosition = navPosition + (newWinPosition - winPosition);
+                if (newWinPosition < 0 || winBottom > docHeight) {
+                    return;
+                }
+                navBar.scrollTop(newNavPosition);
+                winPosition = newWinPosition;
+            },
+            resize = function () {
+                winResize = false;
+                winHeight = win.height();
+                docHeight = $(document).height();
+            },
             hashChange = function () {
                 linkScroll = true;
                 win.one('hashchange', function () {

media/font/fonts/Inconsolata.ttf

@@ -7,3 +7,5 @@ typekit_id = hiw1hhg
 analytics_id = 
 sticky_navigation = False
 logo_only =
+collapse_navigation = False
+display_version = True