Fix regressions introduced in 1.25.0

The 1.25.0 theme failed to pick up the new root_title option
and ate a meaningful space in "Page Contents". This should fix
both issues.

Change-Id: I3e77586850daef9b1e7cd2ae24889bc00a074413
This commit is contained in:
Thierry Carrez 2018-09-28 12:53:49 +02:00
parent c3bf0d1f62
commit fe777233f0
3 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
<head>
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
{% block header %}{% endblock %}
<title>{{ root_title|striptags }}: {{ title|striptags }}</title>
<title>{{ theme_root_title|striptags }}: {{ title|striptags }}</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

View File

@ -1,7 +1,7 @@
{%- if theme_sidebar_mode == 'toctree' and theme_display_toc and display_toc %}
<div class="docs-sidebar-toc">
<div class="docs-sidebar-section" id="local-table-of-contents">
<h4 class="docs-sidebar-section-title">{%- if theme_display_global_toc_section %}Page {%- endif %}Contents</h4>
<h4 class="docs-sidebar-section-title">{% if theme_display_global_toc_section %}Page {% endif %}Contents</h4>
{{ toc }}
</div>
</div>

View File

@ -1,6 +1,6 @@
<div class="col-lg-3 col-md-4 col-sm-4 col-lg-pull-9 col-md-pull-8 col-sm-pull-8 docs-sidebar">
<div class="btn-group docs-sidebar-releases">
<button onclick="location.href='/'" class="btn docs-sidebar-home" data-toggle="tooltip" data-placement="top" title="{{ root_title|striptags }} Home"><i class="fa fa-arrow-circle-o-left"></i></button>
<button onclick="location.href='/'" class="btn docs-sidebar-home" data-toggle="tooltip" data-placement="top" title="{{ theme_root_title|striptags }} Home"><i class="fa fa-arrow-circle-o-left"></i></button>
{%- if theme_sidebar_dropdown == 'api_ref' %}
{% include 'sidebartoc_menu_apiref.html' %}