Skip to content

Commit

Permalink
remove explicit bootstrap-sass dependency
Browse files Browse the repository at this point in the history
To pave the way for bootstrap 4 support. App needs to decide whether it wants bootstrap 3 or 4, and include the proper dependency itself. Browse-everything including the bootstrap-sass dependency in it's gemspec prevented apps from using bootstrap4, which is delivered via a separate gem called just , as they would conflict.
  • Loading branch information
jrochkind committed Nov 21, 2018
1 parent b7e87ca commit de02dc6
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ If you prefer not to use the generator, or need info on how to set up providers

### Include the CSS and JavaScript

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.
Browse-everything depends on bootstrap. If your app does not already have (Bootstrap3) [bootstrap-sass](https://github.com/twbs/bootstrap-sass) in it's dependencies, you should add it to your Gemfile.

If you don't already have `@import 'bootstrap-sprockets'` and `@import 'bootstrap'` in your `application.scss` (per bootstrap-sass installation instructions), 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

Expand Down
1 change: 0 additions & 1 deletion browse-everything.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ Gem::Specification.new do |spec|

spec.add_dependency 'addressable', '~> 2.5'
spec.add_dependency 'aws-sdk-s3'
spec.add_dependency 'bootstrap-sass', '~> 3.2'
spec.add_dependency 'dropbox_api', '>= 0.1.10'
spec.add_dependency 'google-api-client', '~> 0.23'
spec.add_dependency 'google_drive', '~> 2.1'
Expand Down
1 change: 0 additions & 1 deletion lib/browse-everything.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# frozen_string_literal: true

require 'bootstrap-sass'
require 'browse_everything'
2 changes: 2 additions & 0 deletions spec/test_app_templates/Gemfile.extra
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
gem 'jquery-rails'
gem 'puma-rails'
# bootstrap3
gem "bootstrap-sass"

0 comments on commit de02dc6

Please sign in to comment.