Merge branch 'master' into restart-consistency

This commit is contained in:
Axel Kohlmeyer
2020-03-19 05:32:45 -04:00
30 changed files with 335 additions and 217 deletions

View File

@ -1,5 +1,4 @@
<div role="navigation" aria-label="breadcrumbs navigation">
<div style="text-align: center; margin-bottom: -1.5em; display: block"><b>LAMMPS</b> {{ version }}</div>
<ul class="wy-breadcrumbs">
<li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
{% for doc in parents %}
@ -22,7 +21,7 @@
{% endif %}
</li>
</ul>
<hr/>
<hr style="margin-top: 6px; margin-bottom: 6px;" width="100%"/>
{% if next or prev %}
<div class="rst-footer-buttons" style="margin-bottom: 1em" role="navigation" aria-label="footer navigation">
{% if next %}

View File

@ -10,7 +10,7 @@
</div>
{% endif %}
<hr/>
<hr style="margin-top: 6px; margin-bottom: 6px;" width="100%"/>
<div role="contentinfo">
<p>

View File

@ -100,6 +100,8 @@
{% endif %}
</a>
<div class="lammps_version">Version: <b>{{ version }}</b></div>
{% include "searchbox.html" %}
{% endblock %}

View File

@ -4189,8 +4189,7 @@ div[class^='highlight'] pre {
}
}
.wy-affix {
position: fixed;
top: 1.618em;
position: fixed; top: 0.618em;
}
.wy-menu a:hover {
@ -4411,7 +4410,7 @@ div[class^='highlight'] pre {
font-weight: bold;
display: inline-block;
padding: 4px 6px;
margin-bottom: 0.809em;
/*margin-bottom: 0.809em;*/
}
.wy-side-nav-search > a:hover, .wy-side-nav-search .wy-dropdown > a:hover {
background: rgba(255, 255, 255, 0.1);
@ -4540,7 +4539,7 @@ div[class^='highlight'] pre {
}
.wy-nav-content {
padding: 1.618em 3.236em;
padding: 0.5em 1.0em;
height: 100%;
margin: auto;
}
@ -5105,4 +5104,10 @@ span[id*='MathJax-Span'] {
padding: 0;
}
.lammps_version {
text-align: center;
display: block;
margin-bottom: 0.809em;
}
/*# sourceMappingURL=theme.css.map */

View File

@ -202,7 +202,6 @@ bcolor
bdiam
bdw
Beckman
behaviour
Belak
Bellott
benchmarking
@ -2559,8 +2558,7 @@ Salles
sandia
Sandia
sandybrown
Sanitizer
sanitizers
sanitizer
Sanyal
sc
scafacos