github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 21:43:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rails master fixes

Browse Source
This commit is contained in:
Sam 2014-11-11 12:58:56 +11:00
parent 4e1c5177db
commit 23ad68678e
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile_master.lock
View File

@ -64,11 +64,11 @@ GIT
GIT
remote: https://github.com/rails/sass-rails.git
revision: 423178729e7b84addcee78b33891644b1fc1705b
revision: b4b5f32a2928ef203f4b442bc538a572645de8e3
specs:
sass-rails (5.0.0.beta1)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2)
sass (~> 3.2, >= 3.2.2)
sprockets (~> 2.12)
sprockets-rails (>= 2.0, < 4.0)

19
config/initializers/sprockets.rb
View File

@ -2,5 +2,20 @@ require_dependency 'sass/discourse_stylesheets'
require_dependency 'sass/discourse_sass_importer'
require_dependency 'sass/discourse_safe_sass_importer'
Sprockets.send(:remove_const, :SassImporter)
Sprockets::SassImporter = DiscourseSassImporter
if defined?(Sass::Rails::SassTemplate)
DiscourseSassTemplate = Class.new(Sass::Rails::SassTemplate) do
def importer_class
DiscourseSassImporter
end
end
DiscourseScssTemplate = Class.new(DiscourseSassTemplate) do
def syntax
:scss
end
end
Rails.application.assets.register_engine '.sass', DiscourseSassTemplate
Rails.application.assets.register_engine '.scss', DiscourseScssTemplate
else
Sprockets.send(:remove_const, :SassImporter)
Sprockets::SassImporter = DiscourseSassImporter
end