Update sphinx_rtd_theme

ciaran2 · Apr 1, 2015 · 524a1f9 · 524a1f9
1 parent 28cfae1
commit 524a1f9
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 19 deletions.
diff --git a/doc/_themes/sphinx_rtd_theme/__init__.py b/doc/_themes/sphinx_rtd_theme/__init__.py
@@ -5,7 +5,7 @@
 """
 import os
 
-VERSION = (0, 1, 5)
+VERSION = (0, 1, 7)
 
 __version__ = ".".join(str(v) for v in VERSION)
 __version_full__ = __version__

diff --git a/doc/_themes/sphinx_rtd_theme/breadcrumbs.html b/doc/_themes/sphinx_rtd_theme/breadcrumbs.html
@@ -7,9 +7,11 @@
     <li>{{ title }}</li>
       <li class="wy-breadcrumbs-aside">
         {% if display_github %}
-          <a href="https://github.com/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-github"> Edit on GitHub</a>
+          <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-github"> Edit on GitHub</a>
         {% elif display_bitbucket %}
           <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
+        {% elif show_source and source_url_prefix %}
+          <a href="{{ source_url_prefix }}{{ pagename }}{{ source_suffix }}">View page source</a>
         {% elif show_source and has_source and sourcename %}
           <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
         {% endif %}

diff --git a/doc/_themes/sphinx_rtd_theme/footer.html b/doc/_themes/sphinx_rtd_theme/footer.html
@@ -28,6 +28,9 @@
     </p>
   </div>
 
+  {%- if show_sphinx %}
   {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
-
+  {%- endif %}
+
 </footer>
+
diff --git a/doc/_themes/sphinx_rtd_theme/layout.html b/doc/_themes/sphinx_rtd_theme/layout.html
@@ -12,6 +12,7 @@
 <!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
 <head>
   <meta charset="utf-8">
+  {{ metatags }}
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   {% block htmltitle %}
   <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
@@ -23,7 +24,6 @@
   {% endif %}
 
   {# CSS #}
-  <link href='https://fonts.googleapis.com/css?family=Lato:400,700,400italic,700italic|Roboto+Slab:400,700|Inconsolata:400,700&subset=latin,cyrillic' rel='stylesheet' type='text/css'>
 
   {# OPENSEARCH #}
   {% if not embedded %}
@@ -42,6 +42,10 @@
     <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
   {% endfor %}
 
+  {% for cssfile in extra_css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+  {% endfor %}
+
   {%- block linktags %}
     {%- if hasdoc('about') %}
         <link rel="author" title="{{ _('About these documents') }}"
@@ -71,7 +75,7 @@
   {%- block extrahead %} {% endblock %}
 
   {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
+  <script src="_static/js/modernizr.min.js"></script>
 
 </head>
 
@@ -83,9 +87,22 @@
     <nav data-toggle="wy-nav-shift" class="wy-nav-side">
       <div class="wy-side-nav-search">
         {% block sidebartitle %}
-          <a href="{{ pathto(master_doc) }}" class="fa fa-home"> {{ project }}</a>
-        {% endblock %}
+
+        {% if logo and theme_logo_only %}
+          <a href="{{ pathto(master_doc) }}">
+        {% else %}
+          <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
+        {% endif %}
+
+        {% if logo %}
+          {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
+          <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
+        {% endif %}
+        </a>
+
         {% include "searchbox.html" %}
+
+        {% endblock %}
       </div>
 
       <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">

diff --git a/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map b/doc/_themes/sphinx_rtd_theme/static/css/badge_only.css.map
diff --git a/doc/_themes/sphinx_rtd_theme/static/css/theme.css b/doc/_themes/sphinx_rtd_theme/static/css/theme.css
diff --git a/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map b/doc/_themes/sphinx_rtd_theme/static/css/theme.css.map
diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf b/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf
diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata.ttf b/doc/_themes/sphinx_rtd_theme/static/fonts/Inconsolata.ttf
diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf b/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf
diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf b/doc/_themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf
diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf b/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf
diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf b/doc/_themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf