Update to use sir-trevor 0.6

sul-dlss · Aug 2, 2016 · d743f8d · d743f8d
1 parent deba7ef
commit d743f8d
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 44 deletions.
diff --git a/Gemfile b/Gemfile
@@ -69,7 +69,7 @@ gem 'bootstrap-sass', '~> 3.3.5'
 gem 'blacklight', '~> 6.3'
 gem 'blacklight-gallery', '~> 0.3'
 gem 'blacklight-maps', '0.2.0'
-gem 'blacklight-spotlight', '~> 0.19'
+gem 'blacklight-spotlight', '~> 0.19', github: 'projectblacklight/spotlight', branch: 'st06'
 gem 'devise'
 gem 'devise-guests', '~> 0.3'
 gem 'devise-remote-user'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,38 @@
+GIT
+  remote: git://github.com/projectblacklight/spotlight.git
+  revision: 5ab1b037fc7fa5019f86699805283cdfa94d0f50
+  branch: st06
+  specs:
+    blacklight-spotlight (0.21.0)
+      acts-as-taggable-on (>= 4.0.0.pre)
+      autoprefixer-rails
+      blacklight (~> 6.3)
+      blacklight-gallery (>= 0.3.0)
+      blacklight-oembed (>= 0.0.3)
+      bootstrap_form (~> 2.2)
+      breadcrumbs_on_rails (~> 2.3.0)
+      cancancan
+      carrierwave
+      carrierwave-crop
+      devise (>= 3.0)
+      devise_invitable (~> 1.6)
+      faraday
+      faraday_middleware
+      friendly_id (>= 5.2.0.beta.1, < 6)
+      github-markup
+      legato
+      mini_magick
+      nokogiri
+      oauth2
+      openseadragon
+      paper_trail (~> 5.0)
+      rails (>= 4.2.0, < 6)
+      roar-rails
+      signet
+      sir_trevor_rails (~> 0.5)
+      tophat
+      underscore-rails (~> 1.6)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -36,7 +71,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts-as-taggable-on (4.0.0.pre)
+    acts-as-taggable-on (4.0.0)
       activerecord (>= 4.0)
     addressable (2.4.0)
     airbrussh (1.1.0)
@@ -72,37 +107,6 @@ GEM
       bootstrap-sass (~> 3.0)
       rails
       ruby-oembed
-    blacklight-spotlight (0.21.0)
-      acts-as-taggable-on (>= 4.0.0.pre)
-      autoprefixer-rails
-      blacklight (~> 6.3)
-      blacklight-gallery (>= 0.3.0)
-      blacklight-oembed (>= 0.0.3)
-      bootstrap_form (~> 2.2)
-      breadcrumbs_on_rails (~> 2.3.0)
-      cancancan
-      carrierwave
-      carrierwave-crop
-      devise (>= 3.0)
-      devise_invitable (~> 1.6)
-      faraday
-      faraday_middleware
-      friendly_id (>= 5.2.0.beta.1, < 6)
-      github-markup
-      legato
-      lodash-rails
-      mini_magick
-      nokogiri
-      oauth2
-      openseadragon
-      paper_trail (~> 5.0)
-      rails (>= 4.2.0, < 6)
-      roar-rails
-      signet
-      sir_trevor_rails (~> 0.5)
-      social-share-button (~> 0.3)
-      tophat
-      underscore-rails (~> 1.6)
     bootstrap-sass (3.3.7)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
@@ -177,7 +181,7 @@ GEM
     daemons (1.2.3)
     database_cleaner (1.5.3)
     debug_inspector (0.0.2)
-    deep_merge (1.0.1)
+    deep_merge (1.1.1)
     delayed_job (4.1.2)
       activesupport (>= 3.0, < 5.1)
     delayed_job_active_record (4.1.1)
@@ -275,8 +279,6 @@ GEM
     leaflet-sidebar-rails (0.0.3)
     legato (0.7.0)
       multi_json
-    lodash-rails (4.14.1)
-      railties (>= 3.1)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.4)
@@ -311,7 +313,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    openseadragon (0.2.1)
+    openseadragon (0.3.0)
       rails (> 3.2.0)
     orm_adapter (0.5.0)
     paper_trail (5.2.0)
@@ -366,7 +368,7 @@ GEM
     responders (2.2.0)
       railties (>= 4.2.0, < 5.1)
     retries (0.0.5)
-    riiif (0.4.0)
+    riiif (0.4.1)
       rails (> 3.2.0)
     roar (1.0.4)
       representable (>= 2.0.1, < 2.4.0)
@@ -402,8 +404,8 @@ GEM
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.5.1)
-      rubocop (>= 0.41.2)
+    rubocop-rspec (1.5.2)
+      rubocop (>= 0.42.0)
     ruby-oembed (0.10.1)
     ruby-progressbar (1.8.1)
     rubyzip (1.2.0)
@@ -459,7 +461,7 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.11)
-    sshkit (1.11.1)
+    sshkit (1.11.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stanford-mods (2.2.0)
@@ -480,7 +482,7 @@ GEM
     tophat (2.3.0)
       actionpack (>= 3.0.0)
     trollop (2.1.2)
-    turbolinks (5.0.0)
+    turbolinks (5.0.1)
       turbolinks-source (~> 5)
     turbolinks-source (5.0.0)
     turnout (2.3.1)
@@ -522,7 +524,7 @@ DEPENDENCIES
   blacklight (~> 6.3)
   blacklight-gallery (~> 0.3)
   blacklight-maps (= 0.2.0)
-  blacklight-spotlight (~> 0.19)
+  blacklight-spotlight (~> 0.19)!
   bootstrap-sass (~> 3.3.5)
   byebug
   capistrano (~> 3.0)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -3,7 +3,6 @@
 @import "bootstrap-sprockets";
 @import "variables";
 @import "sir-trevor";
-@import "sir-trevor-icons";
 @import "bootstrap";
 @import "openseadragon";
 @import "blacklight";