Skip to content

Commit

Permalink
update bootstrap sprockets include
Browse files Browse the repository at this point in the history
  • Loading branch information
mejackreed committed Aug 7, 2014
1 parent 611feb0 commit ec145c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 2 additions & 2 deletions blacklight.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.summary = "Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr) index."
s.description = %q{Blacklight is an open source Solr user interface discovery platform. You can use Blacklight to enable searching and browsing of your collections. Blacklight uses the Apache Solr search engine to search full text and/or metadata.}
s.license = "Apache 2.0"

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
Expand All @@ -21,7 +21,7 @@ Gem::Specification.new do |s|
s.add_dependency "nokogiri", "~>1.6" # XML Parser
s.add_dependency "kaminari", "~> 0.13" # the pagination (page 1,2,3, etc..) of our search results
s.add_dependency "rsolr", "~> 1.0.6" # Library for interacting with rSolr.
s.add_dependency "bootstrap-sass", "~> 3.0"
s.add_dependency "bootstrap-sass", "~> 3.2"
s.add_dependency "deprecation"

s.add_development_dependency "jettywrapper", ">= 1.7.0"
Expand Down
2 changes: 2 additions & 0 deletions lib/generators/blacklight/templates/blacklight.css.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import 'bootstrap-sprockets';

@import 'bootstrap';

@import 'blacklight/blacklight';

0 comments on commit ec145c3

Please sign in to comment.