update compass to 0.12.1 (via compass-rails 1.0.1)
gets rid of "on_updating_stylesheet" deprecation warning Change-Id: Ibec7853e251508ad663dee78de6d190af0bee0fd Reviewed-on: https://gerrit.instructure.com/10123 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Simon Williams <simon@instructure.com>
This commit is contained in:
parent
42f0b97527
commit
92b3509933
5
Gemfile
5
Gemfile
|
@ -8,7 +8,6 @@ gem 'authlogic', '2.1.3'
|
|||
gem "aws-s3-instructure", "~> 0.6.2.1319643167", :require => 'aws/s3'
|
||||
gem 'bcrypt-ruby', '3.0.1'
|
||||
gem 'builder', '2.1.2'
|
||||
gem 'compass', '0.11.5'
|
||||
gem 'daemons', '1.1.0'
|
||||
gem 'diff-lcs', '1.1.2', :require => 'diff/lcs'
|
||||
gem 'erubis', '2.7.0'
|
||||
|
@ -52,6 +51,10 @@ gem 'xml-simple', '1.0.12', :require => 'xmlsimple'
|
|||
# this is only needed by jammit, but we're pinning at 0.9.4 because 0.9.5 breaks
|
||||
gem 'yui-compressor', '0.9.4'
|
||||
|
||||
group :assets do
|
||||
gem 'compass-rails', '1.0.1'
|
||||
end
|
||||
|
||||
group :mysql do
|
||||
gem 'mysql', '2.8.1'
|
||||
end
|
||||
|
|
|
@ -1,5 +1 @@
|
|||
require 'compass'
|
||||
# If you have any compass plugins, require them here.
|
||||
Compass.add_project_configuration(File.join(RAILS_ROOT, "config", "compass.config"))
|
||||
Compass.configuration.environment = RAILS_ENV.to_sym
|
||||
Compass.configure_sass_plugin!
|
||||
require 'compass-rails'
|
||||
|
|
|
@ -1,13 +1,10 @@
|
|||
require 'compass'
|
||||
require 'compass/commands'
|
||||
|
||||
namespace :css do
|
||||
desc "Compile css assets."
|
||||
task :generate do
|
||||
require 'config/initializers/plugin_symlinks'
|
||||
|
||||
# initialize compass if it hasn't been yet
|
||||
Compass::AppIntegration::Rails.initialize! unless Compass::AppIntegration::Rails.booted?
|
||||
require 'action_controller'
|
||||
require 'compass-rails'
|
||||
require 'compass/commands'
|
||||
|
||||
# build the list of files ourselves so that we get it to follow symlinks
|
||||
sass_path = File.expand_path(Compass.configuration.sass_path)
|
||||
|
|
Loading…
Reference in New Issue