Removing incorrectly merged commits

This commit is contained in:
Eric Hough 2014-01-22 00:08:54 -05:00
parent 94d0d7bbb3
commit 865373f5ff
3 changed files with 3 additions and 12 deletions

View File

@ -30,6 +30,7 @@
{% if use_opensearch %} {% if use_opensearch %}
<link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/> <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
{% endif %} {% endif %}
{% endif %} {% endif %}
{# RTD hosts this file, so just load on non RTD builds #} {# RTD hosts this file, so just load on non RTD builds #}
@ -81,16 +82,7 @@
{# SIDE NAV, TOGGLES ON MOBILE #} {# SIDE NAV, TOGGLES ON MOBILE #}
<nav data-toggle="wy-nav-shift" class="wy-nav-side"> <nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-nav-search"> <div class="wy-side-nav-search">
{% if logo and theme_logo_only %} <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}</a>
<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" %} {% include "searchbox.html" %}
</div> </div>

File diff suppressed because one or more lines are too long

View File

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