Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions doc/sphinx-guides/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# match version used by Jenkins
Sphinx==1.5.6
# current version as of this writing
Sphinx==3.5.4
4 changes: 1 addition & 3 deletions doc/sphinx-guides/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,7 @@
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']

html_js_files = [
'js/jquery-3.4.1.min.js',
]
#html_js_files = []

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx_bootstrap_theme/bootstrap/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{% endif %}

{% set script_files = script_files + [
'_static/js/jquery-3.4.1.min.js',
'_static/js/jquery-3.5.1.min.js',
'_static/js/jquery-ui.min.js',
'_static/bootstrap-' + bootstrap_version + '/js/bootstrap.min.js',
'_static/js/jquery-fix.js',
Expand Down Expand Up @@ -84,7 +84,7 @@
<div class="container">
<div class="row">
{%- block sidebar1 %}{{ bsidebar() }}{% endblock %}
<div class="{{ bs_span_prefix }}{{ bs_content_width }} content">
<div class="{{ bs_span_prefix }}{{ bs_content_width }} content" role="main">
{% block body %}{% endblock %}
</div>
{% block sidebar2 %} {# possible location for sidebar #} {% endblock %}
Expand Down
6 changes: 5 additions & 1 deletion doc/sphinx_bootstrap_theme/bootstrap/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
#}
{%- extends "layout.html" %}
{% set title = _('Search') %}
{% set script_files = script_files + ['_static/searchtools.js'] %}
{%- block scripts %}
{{ super() }}
<script src="{{ pathto('_static/searchtools.js', 1) }}"></script>
<script src="{{ pathto('_static/language_data.js', 1) }}"></script>
{%- endblock %}
{% block extrahead %}
<script type="text/javascript">
jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
Expand Down

This file was deleted.

Large diffs are not rendered by default.