Use sass to compile the stylesheets.
Removed unused text.scss and grid.scss.
---
aeolus-conductor.spec.in | 14 ++++-------
src/app/stylesheets/_base.scss | 4 ---
src/app/stylesheets/grid.scss | 39 ---------------------------------
src/app/stylesheets/text.scss | 30 -------------------------
src/config/compass.rb | 13 -----------
src/config/environments/production.rb | 4 +--
src/config/initializers/compass.rb | 5 ----
7 files changed, 6 insertions(+), 103 deletions(-)
delete mode 100644 src/app/stylesheets/grid.scss
delete mode 100644 src/app/stylesheets/text.scss
delete mode 100644 src/config/compass.rb
delete mode 100644 src/config/initializers/compass.rb
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 9ec229b..7add074 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -26,8 +26,6 @@ Requires: rubygem(will_paginate) >= 3.0
Requires: rubygem(parseconfig)
Requires: rubygem(authlogic) >= 3.0.2
Requires: rubygem(deltacloud-client) >= 0.0.9.8
-Requires: rubygem(compass) >= 0.10.2
-Requires: rubygem(compass-960-plugin)
Requires: rubygem(simple-navigation)
Requires: rubygem(typhoeus)
Requires: rubygem(rest-client) >= 1.6.1
@@ -46,9 +44,6 @@ Requires: ruby-postgres
# and is accessible in the init script
Requires: curl
-BuildRequires: rubygem(compass) >= 0.10.2
-BuildRequires: rubygem(compass-960-plugin)
-
BuildArch: noarch
%description
@@ -174,10 +169,11 @@ for filetype in builder css feature gif haml html ico jpg js json
key opts png \
done
# precompile stylesheets
-cd src
-compass compile --output-style compact
-%{__mv} public/stylesheets/compiled %{buildroot}%{app_root}/public/stylesheets/
-cd ..
+%{__mkdir} %{buildroot}%{app_root}/public/stylesheets/compiled
+sass --style compact ./src/app/stylesheets/application.scss
%{buildroot}%{app_root}/public/stylesheets/compiled/application.css
+sass --style compact ./src/app/stylesheets/custom.scss
%{buildroot}%{app_root}/public/stylesheets/compiled/custom.css
+sass --style compact ./src/app/stylesheets/layout.scss
%{buildroot}%{app_root}/public/stylesheets/compiled/layout.css
+sass --style compact ./src/app/stylesheets/login.scss
%{buildroot}%{app_root}/public/stylesheets/compiled/login.css
# misc files
%{__cp} src/Rakefile %{buildroot}%{app_root}
diff --git a/src/app/stylesheets/_base.scss b/src/app/stylesheets/_base.scss
index 3ac43c6..67a3c7b 100644
--- a/src/app/stylesheets/_base.scss
+++ b/src/app/stylesheets/_base.scss
@@ -1,5 +1,3 @@
-@import "grid";
-
$screenfont: "Liberation Sans", "Droid Sans", Helvetica, Arial,
sans-serif;
/* $headlinefont: "Roadgeek E", Interstate, sans-serif; */
$headlinefont: "FreeWay Bold", FreeWay, Interstate, sans-serif;
@@ -26,8 +24,6 @@ $goodcl: #bfcc29;
$okcl: #f6a20a;
$badcl: #cb292b;
-@import "text";
-
@mixin border-radius($radius) {
border-radius: $radius;
-moz-border-radius: $radius;
diff --git a/src/app/stylesheets/grid.scss b/src/app/stylesheets/grid.scss
deleted file mode 100644
index 3b231ca..0000000
--- a/src/app/stylesheets/grid.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 960 Grid System ~ Core CSS.
- * Learn more ~
http://960.gs/
- * *
- * Licensed under GPL and MIT. */
-
-@import "compass/reset";
-@import "960/grid";
-
-// The following generates the default grids provided by the css version of 960.gs
-.container_12 {
- @include grid-system(12);
-}
-
-.container_16 {
- @include grid-system(16);
-}
-
-// But most compass users prefer to construct semantic layouts like so (two column layout
with header and footer):
-
-$ninesixty-columns: 24;
-
-.two-column {
- @include grid-container;
- #header,
- #footer,
- #sidebar,
- #main-content {
- @include grid-unit-base;
- }
- #header, #footer {
- @include grid-width(24);
- }
- #sidebar {
- @include grid-width(8);
- }
- #main-content {
- @include grid-width(16);
- }
-}
diff --git a/src/app/stylesheets/text.scss b/src/app/stylesheets/text.scss
deleted file mode 100644
index b6819c3..0000000
--- a/src/app/stylesheets/text.scss
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 960 Grid System ~ Text CSS.
- * Learn more ~
http://960.gs/
- * *
- * Licensed under GPL and MIT. */
-
-@import "960/text";
-
-@include text;
-
-/* Need to solve licensing first */
-@font-face {
- font-family: 'Roadgeek E';
- src: local('Roadgeek E'), local('RoadgeekE'),
- url(../../fonts/RoadgeekE.otf);
-}
-
-/* Headline Font based on Highway Gothic/FHWA to preserve RH identity on the web
unachievable with Interstate */
-@font-face {
- font-family: 'FreeWay Bold';
- src: local('FreeWay Bold'), local('FreeWayBold'),
- url(../../fonts/FreeWay-Bold.ttf);
-}
-
-body {
- font: 12px/1.5 $screenfont;
-}
-
-h1,h2,h3,h4,h5 {
- font-family: $headlinefont;
-}
diff --git a/src/config/compass.rb b/src/config/compass.rb
deleted file mode 100644
index 985bb3a..0000000
--- a/src/config/compass.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# This configuration file works with both the Compass command line tool and within
Rails.
-# Require any additional compass plugins here.
-require 'ninesixty'
-
-project_type = :rails
-project_path = Compass::AppIntegration::Rails.root
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "public/stylesheets/compiled"
-sass_dir = "app/stylesheets"
-environment = Compass::AppIntegration::Rails.env
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true
diff --git a/src/config/environments/production.rb
b/src/config/environments/production.rb
index 3bb1785..1aecd5f 100644
--- a/src/config/environments/production.rb
+++ b/src/config/environments/production.rb
@@ -65,7 +65,5 @@ Conductor::Application.configure do
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
-end
-# Disable stylesheet updates on production
-Compass.configuration.sass_options = { :never_update => true }
+end
diff --git a/src/config/initializers/compass.rb b/src/config/initializers/compass.rb
deleted file mode 100644
index 27f585c..0000000
--- a/src/config/initializers/compass.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-require 'compass'
-rails_root = (defined?(Rails) ? Rails.root : RAILS_ROOT).to_s
-Compass.add_project_configuration(File.join(rails_root, "config",
"compass.rb"))
-Compass.configure_sass_plugin!
-Compass.handle_configuration_change!
\ No newline at end of file
--
1.7.6