Permalink
Browse files

Fixing the web_app_theme.css paths. Removing override.css

  • Loading branch information...
1 parent 2a9f624 commit 164a8509f5f0345b0c3e1698412b35849fd54c28 @tscolari tscolari committed Aug 27, 2011
View
2 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
View
1 app/assets/stylesheets/web-app-theme/override.css
@@ -1 +0,0 @@
-/* Override here any style defined by web-app-theme */
View
1 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
View
5 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
*
*/
View
5 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
*
*/

0 comments on commit 164a850

Please sign in to comment.