Respect html_logo, and throw it in the sidebar, fixes #24

README.rst

@@ -157,4 +157,3 @@ TODO
 ====
 * Update to font-awesome 4.0 and have it build from bower, not the copy/paste hack I have now.
 * Separate some sass variables at the theme level so you can overwrite some basic colors.
-

demo_docs/source/conf.py

@@ -106,7 +106,9 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+html_theme_options = {
+    # '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.
 html_theme_path = ["../.."]

sass/_theme_layout.sass

@@ -127,6 +127,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

@@ -96,7 +96,16 @@
     {# SIDE NAV, TOGGLES ON MOBILE #}
     <nav data-toggle="wy-nav-shift" class="wy-nav-side">
       <div class="wy-side-nav-search">
-        <a href="{{ pathto(master_doc) }}" class="icon icon-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>
         {% include "searchbox.html" %}
       </div>
 

sphinx_rtd_theme/theme.conf

@@ -5,3 +5,4 @@ stylesheet = css/theme.css
 [options]
 typekit_id = hiw1hhg
 analytics_id = 
+logo_only =