diff --git a/designmodo-flatuipro-rails.gemspec b/designmodo-flatuipro-rails.gemspec index a71e977..67ea311 100644 --- a/designmodo-flatuipro-rails.gemspec +++ b/designmodo-flatuipro-rails.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'jquery-ui-rails', '>= 4.0.3' spec.post_install_message = "" \ "**********************************************\n\n" \ - "One *must* run the `rails generate flatuipro:install ` generator\n" \ - "when gem updated to support new FLat UI Pro version\n\n" \ + "One *must* run `rails generate flatuipro:install `\n" \ + "when gem updated\n\n" \ "**********************************************" end diff --git a/lib/designmodo/flatuipro/rails.rb b/lib/designmodo/flatuipro/rails.rb index 100f3fb..400cbd7 100644 --- a/lib/designmodo/flatuipro/rails.rb +++ b/lib/designmodo/flatuipro/rails.rb @@ -8,7 +8,7 @@ class Engine < ::Rails::Engine :after => 'less-rails.after.load_config_initializers', :group => :all do |app| if defined?(Less) - app.config.less.paths << File.join(config.root, 'vendor', 'less') + app.config.less.paths << File.join(config.root, 'app', 'less') end end end diff --git a/lib/generators/flatuipro/demo/demo_generator.rb b/lib/generators/flatuipro/demo/demo_generator.rb index 3725e15..eb0cec6 100644 --- a/lib/generators/flatuipro/demo/demo_generator.rb +++ b/lib/generators/flatuipro/demo/demo_generator.rb @@ -5,11 +5,11 @@ module Flatuipro module Generators class DemoGenerator < Rails::Generators::Base desc "Setup Flat UI Pro Demo page." - source_root File.expand_path("../../../../../vendor/assets/demo", __FILE__) + source_root File.expand_path("../../../../../app/assets/demo", __FILE__) # Detect if Flat UI Pro assets copied over to gem def check_flatuipro_install - unless File.exist?(File.expand_path("../../../../../vendor/assets", __FILE__)) + unless File.exist?(File.expand_path("../../../../../app/assets", __FILE__)) raise "Please run install generator first" end end diff --git a/lib/generators/flatuipro/install/install_generator.rb b/lib/generators/flatuipro/install/install_generator.rb index fef2f55..e1b3e0f 100644 --- a/lib/generators/flatuipro/install/install_generator.rb +++ b/lib/generators/flatuipro/install/install_generator.rb @@ -9,7 +9,7 @@ class InstallGenerator < Rails::Generators::Base source_root File.expand_path("../templates", __FILE__) def copy_assets - gem_assets_dir = File.expand_path("../../../../../vendor/assets", __FILE__) + gem_assets_dir = File.expand_path("../../../../../app/assets", __FILE__) pro_dir = flatuipro_dir unless File.exist?(File.join(pro_dir, "index.html")) @@ -83,7 +83,7 @@ def add_assets end def patch_assets - gem_assets_dir = File.expand_path("../../../../../vendor/assets", __FILE__) + gem_assets_dir = File.expand_path("../../../../../app/assets", __FILE__) # Stylesheets patches # image url() -> image-url()