diff --git a/README.md b/README.md index b78b2a41..49673996 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ If you prefer not to use the generator, or need info on how to set up providers ### Include the CSS and JavaScript -Add `@import "browse_everything";` to your application.css.scss +If you don't already have `@import 'bootstrap-sprockets'` and `@import 'bootstrap'` in your `application.scss`, add them. Somewhere after those lines, add `@import "browse_everything";` to your application.scss. In `app/assets/javascripts/application.js` include jquery and the BrowseEverything diff --git a/app/assets/stylesheets/browse_everything/_browse_everything.scss b/app/assets/stylesheets/_browse_everything.scss similarity index 90% rename from app/assets/stylesheets/browse_everything/_browse_everything.scss rename to app/assets/stylesheets/_browse_everything.scss index 7b950610..aefffb53 100644 --- a/app/assets/stylesheets/browse_everything/_browse_everything.scss +++ b/app/assets/stylesheets/_browse_everything.scss @@ -1,3 +1,6 @@ +// It is important this file starts with underscore, so sprockets-sass won't try to compile +// it independently, even though nothing explicit is directing it to. + @import "jquery.treetable"; @import "jquery.treetable.theme.browse"; diff --git a/app/assets/stylesheets/browse_everything.scss b/app/assets/stylesheets/browse_everything.scss deleted file mode 100644 index 1da8eb27..00000000 --- a/app/assets/stylesheets/browse_everything.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'bootstrap-sprockets'; -@import 'bootstrap'; - -@import "browse_everything/browse_everything"; diff --git a/lib/generators/browse_everything/assets_generator.rb b/lib/generators/browse_everything/assets_generator.rb deleted file mode 100644 index 5aec1e26..00000000 --- a/lib/generators/browse_everything/assets_generator.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -require 'rails/generators' - -class BrowseEverything::AssetsGenerator < Rails::Generators::Base - desc 'This generator installs the browse_everything CSS assets into your application' - - source_root File.expand_path('templates', __dir__) - - def inject_css - copy_file 'browse_everything.scss', 'app/assets/stylesheets/browse_everything.scss' - end -end diff --git a/lib/generators/browse_everything/install_generator.rb b/lib/generators/browse_everything/install_generator.rb index 4d3bce87..ea3399f6 100644 --- a/lib/generators/browse_everything/install_generator.rb +++ b/lib/generators/browse_everything/install_generator.rb @@ -3,17 +3,11 @@ require 'rails/generators' class BrowseEverything::InstallGenerator < Rails::Generators::Base - class_option :'skip-assets', type: :boolean, default: false, desc: 'Skip generating javascript and css assets into the application' - - desc 'This generator installs the browse everything configuration and assets into your application' + desc 'This generator installs the browse everything configuration into your application' source_root File.expand_path('templates', __dir__) def inject_config generate 'browse_everything:config' end - - def inject_assets - generate 'browse_everything:assets' unless options[:'skip-assets'] - end end diff --git a/lib/generators/browse_everything/templates/browse_everything.scss b/lib/generators/browse_everything/templates/browse_everything.scss deleted file mode 100644 index 1da8eb27..00000000 --- a/lib/generators/browse_everything/templates/browse_everything.scss +++ /dev/null @@ -1,4 +0,0 @@ -@import 'bootstrap-sprockets'; -@import 'bootstrap'; - -@import "browse_everything/browse_everything"; diff --git a/spec/test_app_templates/lib/generators/test_app_generator.rb b/spec/test_app_templates/lib/generators/test_app_generator.rb index 72519975..570b93aa 100644 --- a/spec/test_app_templates/lib/generators/test_app_generator.rb +++ b/spec/test_app_templates/lib/generators/test_app_generator.rb @@ -17,7 +17,8 @@ def inject_css copy_file File.expand_path('app/assets/stylesheets/application.css', ENV['RAILS_ROOT']), 'app/assets/stylesheets/application.css.scss' remove_file 'app/assets/stylesheets/application.css' insert_into_file 'app/assets/stylesheets/application.css.scss', after: '*/' do - %(\n\n@import "browse_everything") + # bootstrap 3 + %(\n\n@import "bootstrap-sprockets";\n@import "bootstrap";\n@import "browse_everything";) end end