Merge branch 'master' into kim-simulator-models

# Conflicts: # src/input.cpp
2019-07-02 01:15:29 -04:00
parent 121947e79d b727f0b126
commit 41e8cf3d69
559 changed files with 38969 additions and 7807 deletions
--- a/doc/utils/sphinx-config/_themes/lammps_theme/static/css/theme.css
+++ b/doc/utils/sphinx-config/_themes/lammps_theme/static/css/theme.css
@ -5092,4 +5092,17 @@ span[id*='MathJax-Span'] {
  src: local("Roboto Slab Bold"), local("RobotoSlab-Bold"), url(../fonts/RobotoSlab-Bold.ttf) format("truetype");
 }

+.codeblock, pre.literal-block, .rst-content .literal-block, .rst-content pre.literal-block, div[class^='highlight'] {
+  font-size: 12px;
+  line-height: 1.5;
+  display: block;
+  overflow: auto;
+  color: #404040;
+  padding: 12px 12px;
+}
+
+.codeblock,div[class^='highlight'] {
+  padding: 0;
+}
+
 /*# sourceMappingURL=theme.css.map */
--- a/doc/utils/sphinx-config/false_positives.txt
+++ b/doc/utils/sphinx-config/false_positives.txt
@ -101,6 +101,7 @@ api
 Appl
 Apu
 arccos
+Archlinux
 arcsin
 arg
 args
@ -1531,6 +1532,7 @@ Makefile
 makefiles
 Makefiles
 makelist
+makepkg
 Makse
 malloc
 Malolepsza