Merge remote-tracking branch 'snide/master' into sticky-navigation

Conflicts:
	sphinx_rtd_theme/static/css/theme.css
This commit is contained in:
Eric Hough 2014-01-07 17:53:02 -05:00
commit 9b26927f5d
3 changed files with 7 additions and 3 deletions

View File

@ -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

View File

@ -1,6 +1,9 @@
<ul class="wy-breadcrumbs">
<li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
<li><a href="">{{ title }}</a></li>
{% for doc in parents %}
<li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</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>

File diff suppressed because one or more lines are too long