move CSS precompilation to last step
This commit is contained in:
parent
7f2a80bbc8
commit
8cd9afcfad
|
@ -71,13 +71,12 @@ class Stylesheet::Manager
|
|||
end
|
||||
|
||||
def self.max_file_mtime
|
||||
globs = ["#{Rails.root}/app/assets/stylesheets/**/*.*css"]
|
||||
globs = ["#{Rails.root}/app/assets/stylesheets/**/*.*css",
|
||||
"#{Rails.root}/app/assets/images/**/*.*"]
|
||||
|
||||
Discourse.plugins.map { |plugin| File.dirname(plugin.path) }.each do |path|
|
||||
globs += [
|
||||
"#{path}/plugin.rb",
|
||||
"#{path}/**/*.*css",
|
||||
]
|
||||
globs << "#{path}/plugin.rb"
|
||||
globs << "#{path}/**/*.*css"
|
||||
end
|
||||
|
||||
globs.map do |pattern|
|
||||
|
|
|
@ -132,8 +132,6 @@ def concurrent?
|
|||
end
|
||||
|
||||
task 'assets:precompile' => 'assets:precompile:before' do
|
||||
# Run after assets:precompile
|
||||
Rake::Task["assets:precompile:css"].invoke
|
||||
|
||||
if $bypass_sprockets_uglify
|
||||
puts "Compressing Javascript and Generating Source Maps"
|
||||
|
@ -184,6 +182,8 @@ task 'assets:precompile' => 'assets:precompile:before' do
|
|||
end
|
||||
|
||||
|
||||
Rake::Task["assets:precompile:css"].invoke
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue