diff --git a/static/css/app.less b/less/app.less similarity index 100% rename from static/css/app.less rename to less/app.less diff --git a/static/css/core.less b/less/core.less similarity index 100% rename from static/css/core.less rename to less/core.less diff --git a/static/css/less.install b/less/less.install similarity index 100% rename from static/css/less.install rename to less/less.install diff --git a/static/css/lib/elements.less b/less/lib/elements.less similarity index 100% rename from static/css/lib/elements.less rename to less/lib/elements.less diff --git a/static/css/makefile b/less/makefile similarity index 79% rename from static/css/makefile rename to less/makefile index 0145d87..aa1c00b 100644 --- a/static/css/makefile +++ b/less/makefile @@ -5,8 +5,10 @@ else endif export LESSC +CSSDIR=../static/css/ + all : - $(LESSC) app.less --clean-css="--s1 --advanced --compatibility=ie8" house.css + $(LESSC) app.less --clean-css="--s1 --advanced --compatibility=ie8" $(CSSDIR)house.css local : all @@ -18,4 +20,4 @@ install : ./less.install clean : - rm -f house.css + rm -f $(CSSDIR)house.css diff --git a/makefile b/makefile index 123de1b..f1ba2d2 100644 --- a/makefile +++ b/makefile @@ -3,16 +3,16 @@ all : local install : ./keys.sh gen - cd static/; $(MAKE) install $(MFLAGS) + cd less/; $(MAKE) install $(MFLAGS) local : force_look - cd static/; $(MAKE) $(MFLAGS) + cd less/; $(MAKE) $(MFLAGS) development : force_look - cd static/; $(MAKE) development $(MFLAGS) + cd less/; $(MAKE) development $(MFLAGS) production : force_look - cd static/; $(MAKE) production $(MFLAGS) + cd less/; $(MAKE) production $(MFLAGS) ./build.sh hidden : production diff --git a/static/makefile b/static/makefile deleted file mode 100644 index 4704471..0000000 --- a/static/makefile +++ /dev/null @@ -1,17 +0,0 @@ - -all : local - -install : - cd css/; $(MAKE) install $(MFLAGS) - -local : force_look - cd css/; $(MAKE) $(MFLAGS) - -development : force_look - cd css/; $(MAKE) development $(MFLAGS) - -production : force_look - cd css/; $(MAKE) production $(MFLAGS) - -force_look : - true