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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4b6eae6 --- /dev/null +++ b/Makefile @@ -0,0 +1,11 @@ +RM = rm -f +CP = cp +PATCH = patch +SASS = sass +PHP = php5 + +all: style.css screen.css print.css + +%.css: %.scss + $(SASS) $< $@ + |