move CSS precompilation to last step

lib/stylesheet/manager.rb

@@ -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 += [
+      globs << "#{path}/plugin.rb"
-        "#{path}/plugin.rb",
+      globs << "#{path}/**/*.*css"
-        "#{path}/**/*.*css",
-      ]
     end
 
     globs.map do |pattern|

lib/tasks/assets.rake

@@ -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