Modified base.css to use select2/select2.css, which is compatible wit…

…h the Rails asset pipeline. This modification allows the assets for this gem to compile properly when deployed to Heroku. Fixes jarray52/forem#1
openpprn · Apr 9, 2014 · c84d01a · c84d01a
1 parent a155e41
commit c84d01a
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 1,384 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,7 @@ gemspec
 
 gem 'pry-rails'
 gem 'pry-nav'
+gem 'select2-rails', '~> 3.5.4'
 
 platforms :jruby do
   gem "activerecord-jdbc-adapter", :require => false

diff --git a/app/assets/javascripts/forem.js.erb b/app/assets/javascripts/forem.js.erb
@@ -1,4 +1,4 @@
-//= require select2/select2
+//= require select2
 
 var Forem = {};
 Forem.routes = {};
diff --git a/app/assets/stylesheets/forem/base.css b/app/assets/stylesheets/forem/base.css
@@ -1,3 +1,4 @@
 /*
  *= require select2
-*/
+*/
+
diff --git a/vendor/assets/images/select2/select2-spinner.gif b/vendor/assets/images/select2/select2-spinner.gif
diff --git a/vendor/assets/images/select2/select2.png b/vendor/assets/images/select2/select2.png
diff --git a/vendor/assets/images/select2/select2x2.png b/vendor/assets/images/select2/select2x2.png
diff --git a/vendor/assets/javascripts/select2/select2.js b/vendor/assets/javascripts/select2/select2.js