mirror of
https://github.com/ThePhD/sol2.git
synced 2024-03-22 13:10:44 +08:00
Merge branch 'snide-master' into move-javascript-to-bottom
Conflicts: sphinx_rtd_theme/layout.html
This commit is contained in:
commit
e31a25cb35
|
@ -66,8 +66,9 @@
|
|||
&:hover
|
||||
background: $section-background-color
|
||||
// This is the on state for pages beyond second level
|
||||
li.tocktree-l2.current > a
|
||||
li.toctree-l2.current > a
|
||||
background: darken($section-background-color, 20%)
|
||||
padding: $gutter / 4 $gutter * 1.5
|
||||
li.current ul
|
||||
display: block
|
||||
li ul
|
||||
|
|
|
@ -1,6 +1,9 @@
|
|||
<ul class="wy-breadcrumbs">
|
||||
<li><a href="{{ pathto(master_doc) }}">Docs</a> »</li>
|
||||
<li><a href="">{{ title }}</a></li>
|
||||
{% for doc in parents %}
|
||||
<li><a href="{{ doc.link|e }}">{{ doc.title }}</a> »</li>
|
||||
{% endfor %}
|
||||
<li>{{ title }}</li>
|
||||
<li class="wy-breadcrumbs-aside">
|
||||
{% if display_github %}
|
||||
<a href="https://github.com/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}.rst" class="icon icon-github"> Edit on GitHub</a>
|
||||
|
|
|
@ -70,7 +70,7 @@
|
|||
{%- block extrahead %} {% endblock %}
|
||||
|
||||
{# Keep modernizr in head - http://modernizr.com/docs/#installing #}
|
||||
<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>
|
||||
|
||||
|
@ -139,7 +139,7 @@
|
|||
|
||||
{# RTD hosts this file, so just load on non RTD builds #}
|
||||
{% if not READTHEDOCS %}
|
||||
<script type="text/javascript" src="_static/js/theme.js"></script>
|
||||
<script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
|
||||
{% endif %}
|
||||
|
||||
{%- block inlinejs %} {% endblock %}
|
||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user