remove bootstrap-sass gem version locks in Gemfile; align bootstrap-s…

…ass in .gemspec with blacklight
projectblacklight · Jul 31, 2015 · d3e3398 · d3e3398
1 parent cfa8da8
commit d3e3398
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,12 +8,6 @@ gemspec
 # it'll want sprockets 2.11.0 and we'll have a conflict
 gem 'sprockets', '2.11.0'
 
-# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main
-# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
-# it'll want sass 3.2.0 and we'll have a conflict
-gem 'sass', '~> 3.2.0'
-gem 'bootstrap-sass', ">= 3.1.1.1"
-
 group :test do
   gem 'simplecov', require: false
   gem 'coveralls', require: false

diff --git a/blacklight-maps.gemspec b/blacklight-maps.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rails"
   spec.add_dependency "blacklight", ">= 5.12.0"
-  spec.add_dependency "bootstrap-sass", "~> 3.3.4.1"
+  spec.add_dependency "bootstrap-sass", "~> 3.2"
   spec.add_dependency "leaflet-rails"
   spec.add_dependency "leaflet-markercluster-rails"