Merge branch 'master' into concurrent-editing

So, here's the deal:
 * The meat of [concurrent-editing]:Form.class got merged into [master]:DB.class
 * The string-generation stuff in [concurrent-editing]:Form.class didn't fit
   nicely anywhere anymore, so I got rid of it by makeing datatype explicit.
    * Users.class: declare datatypes explicitly in attrib()
    * index.html.php: use this new explicit data
 * style.scss: add a .small, which we can do because of the datatypes thing.

Conflicts:
	src/controllers/Users.class.php

1 files changed, 37 insertions, 0 deletions

diff --git a/print.scss b/print.scss
new file mode 100644
index 0000000..d608e93
--- /dev/null
+++ b/print.scss
@@ -0,0 +1,37 @@
+body {
+	font-size: 12pt;
+}
+
+div.infobar {
+	display: none;
+}
+
+h1 {
+	page-break-before: always;
+}
+.main_sub h1:first-child {
+	page-break-before: avoid;
+}
+
+fieldset {
+	page-break-inside: auto;
+	border: solid black;
+	border-width: 1pt 0 0 1pt;
+	legend {
+		background-color: white;
+		border: solid 1pt black;
+	}
+}
+
+input[type="password"], input[type="submit"] {
+	display: none;
+}
+input[type="text"] {
+	background: transparent;
+	border: none;
+	border-bottom: solid 1pt black;
+}
+textarea {
+	border: solid 1pt black;
+	height: 5em;
+}