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, 43 insertions, 0 deletions

diff --git a/screen.scss b/screen.scss
new file mode 100644
index 0000000..3705ccb
--- /dev/null
+++ b/screen.scss
@@ -0,0 +1,43 @@
+body {
+	background-color: #FFFF00;
+	div.infobar, div.main {
+		margin: 0 auto;
+		width: 70%;
+		min-width: 30em;
+	}
+	div.infobar {
+		margin-top: .5em;
+		
+		background-color: #0000FF;
+		border: solid #000099;
+		border-width: 1px 1px 0 1px;
+		border-top-left-radius: 0.7em;
+		border-top-right-radius: 0.7em;
+		box-shadow: 0 1px 0 #AAAAFF inset;
+		input[type="submit"] {
+			&:hover, &:active, &:focus {
+				text-decoration: underline;
+			}
+		}
+	}
+	div.main {
+		margin-bottom: 5em;
+		
+		background-color: #FFFFFF;
+		border: solid #AAAA00;
+		border-width: 0 1px 1px 1px;
+		padding-top: 1px;/* we don't want this, but it can't be 0 */
+	}
+	div.main_sub {
+		/* 'main_sub' is basically just to add padding to 'main' w/o it
+		 * extending outside 'all'. */
+		margin: 2em;
+	}
+}
+
+a {
+	color: #555555;
+	&:hover, &:active, &:focus {
+		text-decoration: underline;
+	}
+}