Merge remote-tracking branch 'upstream/dev' into wiki

2016-06-02 22:32:50 -04:00
parent b70c680964 f9075e2a2f
commit b93e398674
428 changed files with 1159 additions and 56248 deletions
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -113,9 +113,6 @@ pre code {
 }

 code {
-	font-size: 1em;
-	padding: 1em 1.5em;
-	border: 1px solid #ccc;
 	background: #ccc;
 	color: #000;
 }