Fixing the web_app_theme.css paths. Removing override.css

gravityblast · Aug 27, 2011 · 164a850 · 164a850
1 parent 2a9f624
commit 164a850
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    web-app-theme (0.8.0)
+    web-app-theme (3.1.0)
       rails (~> 3.1.0.rc6)
 
 GEM

diff --git a/app/assets/stylesheets/web-app-theme/override.css b/app/assets/stylesheets/web-app-theme/override.css
diff --git a/lib/generators/web_app_theme/assets/assets_generator.rb b/lib/generators/web_app_theme/assets/assets_generator.rb
@@ -5,7 +5,6 @@ class AssetsGenerator < Rails::Generators::Base
       class_option :theme,        :type => :string,   :default => :default,   :desc => 'Specify the layout theme to be copied'
 
       def copy_stylesheets
-        copy_file "stylesheets/web-app-theme/override.css"            , "app/assets/stylesheets/web-app-theme/override.css"
         copy_file "stylesheets/web-app-theme/base.css"                , "app/assets/stylesheets/web-app-theme/base.css"
         directory "stylesheets/web-app-theme/themes/#{options.theme}" , "app/assets/stylesheets/web-app-theme/themes/#{options.theme}"
       end

diff --git a/lib/generators/web_app_theme/theme/templates/web_app_theme.css.erb b/lib/generators/web_app_theme/theme/templates/web_app_theme.css.erb
@@ -1,8 +1,7 @@
 /* 
  * This css will include all web-app-theme css you need
  *
- *= require ./web-app-theme/override
- *= require ./web-app-theme/base
- *= require ./web-app-theme/themes/<%= options.theme %>/style.css
+ *= require web-app-theme/base
+ *= require web-app-theme/themes/<%= options.theme %>/style.css
  *
  */
diff --git a/spec/dummy/app/assets/stylesheets/web_app_theme.css b/spec/dummy/app/assets/stylesheets/web_app_theme.css
@@ -1,8 +1,7 @@
 /* 
  * This css will include all web-app-theme css you need
  *
- *= require ./web-app-theme/override
- *= require ./web-app-theme/base
- *= require ./web-app-theme/themes/default/style.css
+ *= require web-app-theme/base
+ *= require web-app-theme/themes/default/style.css
  *
  */