diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-10-09 04:00:06 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-10-09 04:00:06 -0400 |
commit | 38bb3a7c752199ee8f58e16bc784f48a6a600e08 (patch) | |
tree | 771b6d80fbf4fceb6f708ada6bb7b3838e593d66 /style.css | |
parent | f72b9a7658cea71ee1edf4ae678a2c8043d9e5bf (diff) | |
parent | 0fd0403876aacecfde74fca0641530875f09200f (diff) |
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
Diffstat (limited to 'style.css')
-rw-r--r-- | style.css | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/style.css b/style.css deleted file mode 100644 index 226859d..0000000 --- a/style.css +++ /dev/null @@ -1,65 +0,0 @@ -body { - font-family: sans-serif; - margin: 0; - padding: 0; } - div.infobar { - text-align: right; - padding: .1em 0; } - .loggedin div.infobar * { - margin: 0 1em; } - div.infobar input[type="text"], - div.infobar input[type="password"] { - width: 20%; } - div.infobar input[type="submit"] { - background: transparent; - border: none; - font-size: 1em; - padding: 0; } - div.infobar a { - color: #000000; } - div.main { - } - div.main form fieldset li { - clear: both; - padding: .5em 0; } - div.main form fieldset li label { - width: 25%; - float: left; } - div.main form fieldset li input, - div.main form fieldset li textarea { - width: 30%; - float: left; } - div.main form fieldset li p.form_data { - margin-left: 25%; } - div.main form fieldset li.wide { - clear: both; - padding: .5em 0; } - div.main form fieldset li.wide label { - width: 100%; - float: none; } - div.main form fieldset li.wide input, - div.main form fieldset li.wide textarea { - width: 100%; - float: none; } - -h1 { - text-align: center; } -a { - text-decoration: none; } -input[type="text"], textarea { - font-family: monospace; } -iframe { - width: 100%; - height: 100%; } -table, td { - border: solid 1px black; } -table input { - border: none; - width: 100%; - background: transparent; -} -.error { - font-weight: bold; - color: red; } -.http404 { - color: red; } |