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

This commit is contained in:
Daniel Oaks 2013-12-08 22:17:36 +10:00
parent 1e2ec72b10
commit b02048a903
4 changed files with 15 additions and 3 deletions

View File

@ -138,4 +138,3 @@ TODO
* Build real demo docs with lots of rst examples
* 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.
* Add the ability to set a logo.

View File

@ -127,6 +127,14 @@
+font-smooth
&:hover
background: rgba(255,255,255,.1)
img.logo
display: block // display on its own line all the time
margin: 0.85em auto 0
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
.wy-nav .wy-menu-vertical
header

View File

@ -96,7 +96,12 @@
{# 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>
<a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
{% 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>

File diff suppressed because one or more lines are too long