rails master fixes
This commit is contained in:
parent
4e1c5177db
commit
23ad68678e
|
@ -64,11 +64,11 @@ GIT
|
||||||
|
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/rails/sass-rails.git
|
remote: https://github.com/rails/sass-rails.git
|
||||||
revision: 423178729e7b84addcee78b33891644b1fc1705b
|
revision: b4b5f32a2928ef203f4b442bc538a572645de8e3
|
||||||
specs:
|
specs:
|
||||||
sass-rails (5.0.0.beta1)
|
sass-rails (5.0.0.beta1)
|
||||||
railties (>= 4.0.0, < 5.0)
|
railties (>= 4.0.0, < 5.0)
|
||||||
sass (~> 3.2)
|
sass (~> 3.2, >= 3.2.2)
|
||||||
sprockets (~> 2.12)
|
sprockets (~> 2.12)
|
||||||
sprockets-rails (>= 2.0, < 4.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
|
|
||||||
|
|
|
@ -2,5 +2,20 @@ require_dependency 'sass/discourse_stylesheets'
|
||||||
require_dependency 'sass/discourse_sass_importer'
|
require_dependency 'sass/discourse_sass_importer'
|
||||||
require_dependency 'sass/discourse_safe_sass_importer'
|
require_dependency 'sass/discourse_safe_sass_importer'
|
||||||
|
|
||||||
Sprockets.send(:remove_const, :SassImporter)
|
if defined?(Sass::Rails::SassTemplate)
|
||||||
Sprockets::SassImporter = DiscourseSassImporter
|
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
|
||||||
|
|
Loading…
Reference in New Issue