diff --git a/Gemfile b/Gemfile index 4bc6426..35fb717 100644 --- 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" \ No newline at end of file diff --git a/assets/config.rb b/assets/config.rb index 20b88f1..d0f385f 100644 --- 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 = "/" diff --git a/assets/sass/import.scss b/assets/sass/import.scss index cc99670..dc68376 100644 --- a/assets/sass/import.scss +++ b/assets/sass/import.scss @@ -4,7 +4,7 @@ * */ // CSS3 Helpers -------------------------------------------------------------- -@import "compass/css3"; +@import "compass"; // Settings -------------------------------------------------------------- // Susy & Compass use HTML hacks to support IE 6 and 7. You can turn that off. @@ -38,11 +38,6 @@ $screen-smartphone : 6 480px; // width 769-1024px smaller phones in portra $enable-grids : false; -// Clearfix -------------------------------------------------------------- - -@import "compass/utilities/general/clearfix"; -@import "compass/utilities/general/float"; - // Includes -------------------------------------------------------------- @import "lib/_preboot.scss"; diff --git a/assets/sass/screen.scss b/assets/sass/screen.scss index d689e4c..d128df2 100644 --- a/assets/sass/screen.scss +++ b/assets/sass/screen.scss @@ -4,8 +4,7 @@ $legacy-support-for-mozilla: false; $legacy-support-for-ie6: false; $legacy-support-for-ie7: false; -@import "normalize"; -@include normalize; +@import "lib/_normalize.scss"; // Common Geoloqi Core ---------------------------------------------------------