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.scss | |
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.scss')
-rw-r--r-- | style.scss | 118 |
1 files changed, 118 insertions, 0 deletions
diff --git a/style.scss b/style.scss new file mode 100644 index 0000000..dc51087 --- /dev/null +++ b/style.scss @@ -0,0 +1,118 @@ +@mixin box-shadow($shadow) { + -webkit-box-shadow: $shadow; + -moz-box-shadow: $shadow; + box-shadow: $shadow; +} + +body.loggedin { + div.infobar * { + margin: 0 1em; + } +} + +body { + font-family: sans-serif; + margin: 0; + padding: 0; + div.infobar { + text-align: right; + padding: .1em 0; + input[type="text"], + input[type="password"] { + width: 20%; + } + input[type="submit"] { + background: transparent; + border: none; + font-size: 1em; + padding: 0; + } + a { + color: #000000; + } + } + div.main { + form { + fieldset li { + clear: both; + padding: .5em 0; + label { + width: 25%; + float: left; + } + input, textarea { + width: 60%; + float: left; + } + input[type="password"] { + width: 30%; + } + p.form_data { + margin-left: 25%; + } + &.wide { + clear: both; + padding: .5em 0; + label { + width: 100%; + float: none; + } + input, textarea { + width: 100%; + float: none; + } + } + } + table { + border: solid 1px black; + border-collapse: collapse; + border-spacing: 0; + td, th { + border: solid 1px black; + padding: 0; + .cell_width { + display: block; + overflow: hidden; + height: 0px; + @extend input[type="text"]; + } + input { + outline: solid 1px black; + width: 100%; + background: transparent; + border: 0; + &:focus { + outline-color: blue; + @include box-shadow(inset 0 0 1pt 1pt rgba(0,0,1,.5)); + } + } + } + } + } + } +} + +h1 { + text-align: center; +} +a { + text-decoration: none; +} +input[type="text"], textarea { + font-family: monospace; + font-size: 12pt; +} +iframe { + width: 100%; + height: 100%; +} +.error { + font-weight: bold; + color: red; +} +.http404 { + color: red; +} +.small { + font-size: .5em; +}
\ No newline at end of file |