From 327aa644eaf597429d84d7d0609d891689e149c4 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Mon, 28 Mar 2011 15:25:17 +0200 Subject: Avoid sass --include option (use explicit path to default theme instead): not compatible with compass. --- Makefile | 4 +--- actiontabs/style.scss | 2 +- blueview/style.scss | 2 +- goldtype/style.scss | 2 +- monochrome/style.scss | 2 +- 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; /* -- cgit v1.2.3