keep editor.css name consistent between template and user-version, do…

… not attempt to load non-existing rich_editor.css
jgv · Aug 21, 2012 · 40f24da · 40f24da
1 parent c403f9f
commit 40f24da
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/stylesheets/rich/rich_editor.css → app/assets/stylesheets/rich/editor.css b/app/assets/stylesheets/rich/rich_editor.css → app/assets/stylesheets/rich/editor.css
diff --git a/lib/generators/rich/install/install_generator.rb b/lib/generators/rich/install/install_generator.rb
@@ -18,7 +18,7 @@ def setup_route
       end
 
       def install_editor_styles
-        copy_file '../../../../../app/assets/stylesheets/rich/rich_editor.css', 'app/assets/stylesheets/rich/editor.css'
+        copy_file '../../../../../app/assets/stylesheets/rich/editor.css', 'app/assets/stylesheets/rich/editor.css'
       end
 
       def install_javascript

diff --git a/lib/rich/engine.rb b/lib/rich/engine.rb
@@ -7,7 +7,7 @@ class Engine < Rails::Engine
     isolate_namespace Rich
 
     initializer "rich.add_middleware" do |app|
-      app.config.assets.precompile += %w(rich/base.js rich/editor.css rich/rich_editor.css)
+      app.config.assets.precompile += %w(rich/base.js rich/editor.css)
       app.middleware.use 'Rack::RawUpload', :paths => ['/rich/files']
     end