Merge branch 'develop'

styles/rst2html_githublike_fzj.css

@@ -292,17 +292,12 @@ pre {
   font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
   font-size: 12px;
   color: #333333;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  border: 1px solid #ccc;
 }
 
 code {
   padding: 2px 4px;
-  color: #d14;
   white-space: nowrap;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
 }
 
 pre {
@@ -315,12 +310,7 @@ pre {
   word-wrap: break-word;
   white-space: pre;
   white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
+  background-color: #ffffff;
 }
 
 pre.prettyprint {
@@ -968,6 +958,9 @@ ul.auto-toc {
 
 pre.code,
 code {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
   background-color: #f0f0f0
 }