Merge branch 'master' of github.com:geoloqi/Geoloqi-Core

geoloqi · Dec 7, 2012 · 5f1656f · 5f1656f
2 parents a282c57 + 4cc7177
commit 5f1656f
Show file tree

Hide file tree

Showing 16 changed files with 2,047 additions and 1,257 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 gem "sass", 										"3.2.0.alpha.237"
 gem "compass", 									"~> 0.12.1"
 gem "susy", 										"~> 1.0.rc.0"
-gem "compass-normalize-plugin", "~> 0.3.0"
 gem "rake"
 gem "sinatra"
 gem "erubis"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,8 +6,6 @@ GEM
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    compass-normalize-plugin (0.3.0)
-      compass (>= 0.11.1)
     erubis (2.7.0)
     fssm (0.2.9)
     rack (1.4.1)
@@ -29,7 +27,6 @@ PLATFORMS
 
 DEPENDENCIES
   compass (~> 0.12.1)
-  compass-normalize-plugin (~> 0.3.0)
   erubis
   rake
   sass (= 3.2.0.alpha.237)

diff --git a/assets/config.rb b/assets/config.rb
@@ -1,6 +1,5 @@
 # Require any additional compass plugins here.
 require "susy"
-require 'normalize'
 
 # Set this to the root of your project when deployed:
 http_path = "/"