From b74c5117d49c7342a762edfc456e085d91087ca8 Mon Sep 17 00:00:00 2001
From: Nicolae Claudius <nicolae_claudius@yahoo.com>
Date: Sat, 4 Feb 2012 03:21:05 -0800
Subject: [PATCH] hotfixes

---
 Gemfile                                   |  2 +-
 Gemfile.lock                              | 10 ++++++----
 app/assets/stylesheets/application.css    |  5 ++++-
 app/assets/stylesheets/overrides.css.scss |  7 +++++++
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9a7fcad..f31b709 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem 'switch_user', '~> 0.6.0'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'compass', '~> 0.12.alpha.0'
+  gem 'compass-rails', '~> 1.0.0.rc.2'
   gem 'sass-rails', "  ~> 3.2.3"
   gem 'coffee-rails', "~> 3.2.1"
   gem 'uglifier', '>= 1.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7b46433..e3952b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -68,10 +68,12 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    compass (0.12.rc.0)
+    compass (0.12.rc.1)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
+    compass-rails (1.0.0.rc.2)
+      compass (~> 0.12.rc.0)
     daemons (1.0.10)
     dalli (1.1.4)
     database_cleaner (0.7.1)
@@ -83,7 +85,7 @@ GEM
     erubis (2.7.0)
     execjs (1.3.0)
       multi_json (~> 1.0)
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
     factory_girl_rails (1.6.0)
       factory_girl (~> 2.5.0)
@@ -182,7 +184,7 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.8.0)
     rubyzip (0.9.5)
-    sass (3.1.12)
+    sass (3.1.13)
     sass-rails (3.2.4)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -236,7 +238,7 @@ DEPENDENCIES
   capistrano-ext (~> 1.2.1)
   capybara (~> 1.1.1)
   coffee-rails (~> 3.2.1)
-  compass (~> 0.12.alpha.0)
+  compass-rails (~> 1.0.0.rc.2)
   dalli (~> 1.1.3)
   database_cleaner (~> 0.7.1)
   devise (~> 1.5.3)
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index e0bdc8c..aec408a 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -20,7 +20,10 @@
 *= require pages/contact
 *= require pages/donate
 
-*= require active_scaffold
+*= require active_scaffold_layout
+*= require active_scaffold_default
+*= active_scaffold_colors 
+
 *= require overrides
 *= require slides
 *= require_self
diff --git a/app/assets/stylesheets/overrides.css.scss b/app/assets/stylesheets/overrides.css.scss
index eec0638..2e8eaf2 100644
--- a/app/assets/stylesheets/overrides.css.scss
+++ b/app/assets/stylesheets/overrides.css.scss
@@ -23,6 +23,13 @@ body.errors #main .inner {
     margin-top: 15px;
 }
 
+// https://github.com/activescaffold/active_scaffold/commit/686f43c1fbd76224be9b32505ecde6d553a0d26d#commitcomment-931620
+.active-scaffold a,
+.active-scaffold a:visited,
+.active-scaffold a:hover {
+    color: #06c;
+}
+
 #as_domains-active-scaffold .name-column, 
 #as_hosts-active-scaffold .name-column {
     font-weight: bold;