Merge branch 'dev' into oauth2

2018-03-10 15:10:09 -05:00
parent 9b13db1c48 78040330b6
commit a4de63ca92
24 changed files with 492 additions and 210 deletions
--- a/view/css/mod_admin.css
+++ b/view/css/mod_admin.css
@@ -70,3 +70,21 @@
 	margin-top: 0px !important;
 	margin-left: 0px !important;
 }
+
+pre code {
+	background: #F5F5F5;
+	font-family: Courier, monospace;
+	font-size: 1em;
+	padding: 1em 1.5em;
+	display: block;
+	white-space: pre-wrap;
+}
+
+code {
+	background: #F5F5F5;
+	font-family: Courier, monospace;
+	font-size: 1em;
+	display: inline;
+	padding: 0.2em 0.2em;
+	white-space: pre-wrap;
+}