Merge branch 'snide-master' into sticky-navigation

This commit is contained in:
Eric Hough 2014-01-08 12:14:43 -05:00
commit 0cd262d06c

View File

@ -50,7 +50,7 @@
{# RTD hosts these file themselves, so just load on non RTD builds #} {# RTD hosts these file themselves, so just load on non RTD builds #}
{% if not READTHEDOCS %} {% if not READTHEDOCS %}
<link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" /> <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
<script type="text/javascript" src="_static/js/theme.js"></script> <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
{% endif %} {% endif %}
{# STICKY NAVIGATION #} {# STICKY NAVIGATION #}
@ -94,7 +94,7 @@
{%- endblock %} {%- endblock %}
{%- block extrahead %} {% endblock %} {%- block extrahead %} {% endblock %}
<script src="http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
</head> </head>