Skip to content

Commit a1375b8

Browse files
committed
Update to sphinx-bootstrap-theme-0.7.1
1 parent bc33092 commit a1375b8

File tree

2 files changed

+9
-15
lines changed

2 files changed

+9
-15
lines changed

Diff for: themes/bootstrap/layout.html

+5-9
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,6 @@
88
{% set bs_span_prefix = "span" %}
99
{% endif %}
1010

11-
{% set script_files = script_files + [
12-
'_static/js/jquery-1.11.0.min.js',
13-
'_static/js/jquery-fix.js',
14-
'_static/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js',
15-
'_static/bootstrap-sphinx.js'
16-
]
17-
%}
18-
1911
{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and sidebars %}
2012

2113
{%- set bs_content_width = render_sidebar and "9" or "12"%}
@@ -60,6 +52,10 @@
6052
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
6153
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
6254
<meta name="apple-mobile-web-app-capable" content="yes">
55+
<script type="text/javascript" src="{{ pathto('_static/js/jquery-1.11.0.min.js', 1) }} "></script>
56+
<script type="text/javascript" src="{{ pathto('_static/js/jquery-fix.js', 1) }} "></script>
57+
<script type="text/javascript" src="{{ pathto('_static', 1) + '/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js' }} "></script>
58+
<script type="text/javascript" src="{{ pathto('_static/bootstrap-sphinx.js', 1) }} "></script>
6359
{% endblock %}
6460

6561
{# Silence the sidebar's, relbar's #}
@@ -73,7 +69,7 @@
7369
<div class="container">
7470
<div class="row">
7571
{%- block sidebar1 %}{{ bsidebar() }}{% endblock %}
76-
<div class="{{ bs_span_prefix }}{{ bs_content_width }} content">
72+
<div class="body {{ bs_span_prefix }}{{ bs_content_width }} content" role="main">
7773
{% block body %}{% endblock %}
7874
</div>
7975
{% block sidebar2 %} {# possible location for sidebar #} {% endblock %}

Diff for: themes/bootstrap/search.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,9 @@
99
#}
1010
{%- extends "layout.html" %}
1111
{% set title = _('Search') %}
12-
{% set script_files = script_files + ['_static/searchtools.js'] %}
1312
{% block extrahead %}
14-
<script type="text/javascript">
15-
jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
16-
</script>
13+
<script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }} "></script>
14+
<script type="text/javascript" src="{{ pathto('searchindex.js', 1) }} "></script>
1715
{# this is used when loading the search index using $.ajax fails,
1816
such as on Chrome for documents on localhost #}
1917
<script type="text/javascript" id="searchindexloader"></script>
@@ -42,15 +40,15 @@ <h1 id="search-documentation">{{ _('Search') }}</h1>
4240
</div>
4341
<input type="submit" class="btn btn-default" value="{{ _('search') }}" />
4442
<span id="search-progress" style="padding-left: 10px"></span>
45-
</form>
43+
</form>
4644
{% else %}
4745
<form class="form-search">
4846
<input type="text" class="input-medium search-query" name="q" value="" />
4947
<input type="submit" class="btn btn-default" value="{{ _('search') }}" />
5048
<span id="search-progress" style="padding-left: 10px"></span>
5149
</form>
5250
{% endif %}
53-
51+
5452
{% if search_performed %}
5553
<h2>{{ _('Search Results') }}</h2>
5654
{% if not search_results %}

0 commit comments

Comments
 (0)