diff --git a/Gemfile b/Gemfile index b94103561..9b55abaf7 100644 --- a/Gemfile +++ b/Gemfile @@ -23,6 +23,9 @@ group :assets do gem 'therubyracer', :platforms => :ruby gem 'uglifier', '>= 1.0.3' + + gem 'compass-rails', '~> 1.0.3' + gem 'zurb-foundation', '~> 3.0.9' end gem 'jquery-rails' @@ -59,5 +62,3 @@ gem 'cape' # compile sass to css gem 'compass' -# zurb foundation, to make it all look pretty -gem "zurb-foundation", :group => :assets diff --git a/Gemfile.lock b/Gemfile.lock index bc7975cf3..624cc44f9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,6 +51,8 @@ GEM chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) + compass-rails (1.0.3) + compass (>= 0.12.2, < 0.14) daemon_controller (1.0.0) devise (2.1.2) bcrypt-ruby (~> 3.0) @@ -183,6 +185,7 @@ DEPENDENCIES capistrano coffee-rails (~> 3.2.1) compass + compass-rails (~> 1.0.3) devise haml jquery-rails @@ -196,4 +199,4 @@ DEPENDENCIES therubyracer uglifier (>= 1.0.3) webrat - zurb-foundation + zurb-foundation (~> 3.0.9) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1ea12e0c6..409a0ad3c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -10,6 +10,6 @@ * *= require_self *= require foundation_and_overrides - *= require foundation *= require_tree . */ + diff --git a/app/assets/stylesheets/ie.css.scss b/app/assets/stylesheets/ie.css.scss new file mode 100644 index 000000000..5cd5b6c5b --- /dev/null +++ b/app/assets/stylesheets/ie.css.scss @@ -0,0 +1,5 @@ +/* Welcome to Compass. Use this file to write IE specific override styles. + * Import this file using the following HTML or equivalent: + * */ diff --git a/app/assets/stylesheets/print.css.scss b/app/assets/stylesheets/print.css.scss new file mode 100644 index 000000000..b0e9e456f --- /dev/null +++ b/app/assets/stylesheets/print.css.scss @@ -0,0 +1,3 @@ +/* Welcome to Compass. Use this file to define print styles. + * Import this file using the following HTML or equivalent: + * */ diff --git a/app/assets/stylesheets/screen.css.scss b/app/assets/stylesheets/screen.css.scss new file mode 100644 index 000000000..81de84703 --- /dev/null +++ b/app/assets/stylesheets/screen.css.scss @@ -0,0 +1,6 @@ +/* Welcome to Compass. + * In this file you should write your main styles. (or centralize your imports) + * Import this file using the following HTML or equivalent: + * */ + +@import "compass/reset"; diff --git a/config/compass.rb b/config/compass.rb new file mode 100644 index 000000000..2b22d5d7c --- /dev/null +++ b/config/compass.rb @@ -0,0 +1,2 @@ +# Require any additional compass plugins here. +project_type = :rails