summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-03-28 15:35:20 +0200
committerJonas Smedegaard <dr@jones.dk>2011-03-28 15:35:20 +0200
commiteccdd7a64a30d60f21e6391139cb545009a0aaf1 (patch)
tree8ed77f4c8d6b0ac5a14e12639f766eba504c890a
parentea3b0fed40933bfffedd21a25d95d709d7df7b2f (diff)
parent949f949035679d1a5b8ca3cd528acbdfacc10a44 (diff)
Merge commit 'refs/top-bases/compass' into compass
Conflicts: Makefile blueview/style.scss
-rw-r--r--actiontabs/style.scss2
-rw-r--r--blueview/style.scss2
2 files changed, 2 insertions, 2 deletions
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 8e1b0c8..917abaa 100644
--- a/blueview/style.scss
+++ b/blueview/style.scss
@@ -1,7 +1,7 @@
$default-font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
$hilite: #315485;
-@import "ikiwiki";
+@import "../default/ikiwiki";
@include ikiwiki-boilerplate;
/* bzed theme for ikiwiki