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 /screen.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 'screen.css')
-rw-r--r-- | screen.css | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/screen.css b/screen.css deleted file mode 100644 index 3705244..0000000 --- a/screen.css +++ /dev/null @@ -1,50 +0,0 @@ -/* If the indentation looks funny, it's using SASS indentation style. - * See <http://sass-lang.com>. SASS is pretty cool, but I'm too lame actually - * use SASS, because that's one more thing I have to install and run. I already - * have enough trouble saving before I switch to my browser to check it, let - * alone having to run another utility. - * - * To handle the introduction of curly braces (SASS doesn't have any), I've - * handled them as one handles parens in LISP. - * - * On a related note, I actually preffer SCSS to SASS, but I find SASS - * indentation to be more readable when using plain CSS. - */ -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; } - div.infobar input[type="submit"]:hover, - div.infobar input[type="submit"]:active, - div.infobar input[type="submit"]: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; } -a:hover, -a:active, -a:focus { - text-decoration: underline; -} |