summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-03-28 15:25:17 +0200
committerJonas Smedegaard <dr@jones.dk>2013-10-12 21:48:50 +0200
commit327aa644eaf597429d84d7d0609d891689e149c4 (patch)
tree0f9c02334a3584a888eb5762e7bc3d26c616bef9
parentde235df9779c7dc8465a509f6c1cdfde5b05a375 (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
-rw-r--r--goldtype/style.scss2
-rw-r--r--monochrome/style.scss2
5 files changed, 5 insertions, 7 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 9c0d40c..919edde 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 3f698f8..30f24f7 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
diff --git a/goldtype/style.scss b/goldtype/style.scss
index f139521..767e8bc 100644
--- a/goldtype/style.scss
+++ b/goldtype/style.scss
@@ -1,4 +1,4 @@
-@import "ikiwiki";
+@import "../default/ikiwiki";
@include ikiwiki;
/* bzed theme for ikiwiki
diff --git a/monochrome/style.scss b/monochrome/style.scss
index a33c896..226e405 100644
--- a/monochrome/style.scss
+++ b/monochrome/style.scss
@@ -1,6 +1,6 @@
@charset "UTF-8";
@import url(http://fonts.googleapis.com/css?family=Lato&v2);
-@import "ikiwiki";
+@import "../default/ikiwiki";
@include ikiwiki;
/*