Merge remote-tracking branch 'DanielOaks/html_logo'

Conflicts:
	demo_docs/source/conf.py
	sphinx_rtd_theme/layout.html
	sphinx_rtd_theme/static/css/theme.css
	sphinx_rtd_theme/theme.conf

README.rst

@@ -173,4 +173,3 @@ you can add something like this to your config. Thanks to Daniel Oaks for this.
 TODO
 ====
 * Separate some sass variables at the theme level so you can overwrite some basic colors.
-

demo_docs/source/conf.py

@@ -107,7 +107,8 @@ html_theme = 'sphinx_rtd_theme'
 # further.  For a list of options available for each theme, see the
 # documentation.
 html_theme_options = {
-    # 'sticky_navigation' : True  # Set to False to disable the sticky nav while scrolling.
+    # 'sticky_navigation': True  # Set to False to disable the sticky nav while scrolling.
+    # 'logo_only': True,  # if we have a html_logo below, this shows /only/ the logo with no title text
 }
 
 # Add any paths that contain custom themes here, relative to this directory.

sass/_theme_layout.sass

@@ -128,6 +128,17 @@
     +font-smooth
     &:hover
       background: rgba(255,255,255,.1)
+    img.logo
+      display: block  // display on its own line all the time
+      margin: 0 auto
+      height: auto  // undo badge styling above
+      width: auto
+      border-radius: 0
+      max-width: 100%  // shrink on mobile, if appropriate
+      background: rgba(0,0,0,0)  // make hover background of parent show up properly
+    &.icon
+      img.logo
+        margin-top: 0.85em  // space it away from the title text
 
 .wy-nav .wy-menu-vertical
   header

sphinx_rtd_theme/layout.html

@@ -86,9 +86,23 @@
     <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>
+
+        {% 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>
         {% endblock %}
+
         {% include "searchbox.html" %}
+
+        {% endblock %}
       </div>
 
       <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">

sphinx_rtd_theme/theme.conf

@@ -6,3 +6,4 @@ stylesheet = css/theme.css
 typekit_id = hiw1hhg
 analytics_id = 
 sticky_navigation = False
+logo_only =