summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-03-28 15:25:17 +0200
committerJonas Smedegaard <dr@jones.dk>2011-03-28 15:25:17 +0200
commit949f949035679d1a5b8ca3cd528acbdfacc10a44 (patch)
treef625154ebd746ff21520fdad2907f07619d27eaa
parent2d9da55ca699896d6c06026e73bbacfa99c8ab1f (diff)
Avoid sass --include option (use explicit path to default theme instead): not compatible with compass.
-rw-r--r--Makefile4
-rw-r--r--actiontabs/style.scss2
-rw-r--r--blueview/style.scss2
3 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2e5e43c..06b3c30 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
sassfiles = $(filter-out $(wildcard */_*.scss),$(wildcard */*.scss))
cssfiles = $(sassfiles:scss=css)
-sass_includes = default
-
all: $(cssfiles)
%.css: %.scss
- sass $(sass_includes:%=-I %) --style expanded $< $@
+ sass --style expanded $< $@
perl -i -pe 's/ /\t/g' $@
clean:
diff --git a/actiontabs/style.scss b/actiontabs/style.scss
index 02f08cd..1b4044e 100644
--- a/actiontabs/style.scss
+++ b/actiontabs/style.scss
@@ -1,4 +1,4 @@
-@import "ikiwiki";
+@import "../default/ikiwiki";
@include ikiwiki;
/* actiontabs theme for ikiwiki
diff --git a/blueview/style.scss b/blueview/style.scss
index 8944a43..ad875ef 100644
--- a/blueview/style.scss
+++ b/blueview/style.scss
@@ -1,4 +1,4 @@
-@import "ikiwiki";
+@import "../default/ikiwiki";
@include ikiwiki-boilerplate;
/* bzed theme for ikiwiki