While compiling the stylesheets internally in rails seems to work,
it does not when we run compass in the recipe to generate them
ahead of time for production.
This is because each stylesheet is loaded and compiled individually.
Since text.sass depends on variables defined in _base.sass but
cannot include it (since _base.sass includes text.sass) an error
is thrown.
This patch just fixes it so that it works both from within rails
and when the compass command is run manually.
---
src/app/stylesheets/_base.scss | 2 --
src/app/stylesheets/aggregator.scss | 2 +-
src/app/stylesheets/text.scss | 1 +
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss
index dc2a8c6..f982d12 100644
--- a/src/app/stylesheets/_base.scss
+++ b/src/app/stylesheets/_base.scss
@@ -26,8 +26,6 @@ $goodcl: #bfcc29;
$okcl: orange;
$badcl: red;
-...@import "text";
-
@mixin border-radius($radius) {
border-radius: $radius;
-moz-border-radius: $radius;
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index c4300c4..47538b5 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -1,5 +1,5 @@
@charset "UTF-8";
-...@import "base";
+...@import "text";
html {
}
diff --git a/src/app/stylesheets/text.scss b/src/app/stylesheets/text.scss
index cce296a..c0b7428 100644
--- a/src/app/stylesheets/text.scss
+++ b/src/app/stylesheets/text.scss
@@ -4,6 +4,7 @@
* Licensed under GPL and MIT. */
@import "960/text";
+...@import "base";
@include text;
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
