diff options
| author | jpl | 2016-11-15 10:05:03 +0100 |
|---|---|---|
| committer | jpl | 2016-11-15 10:05:11 +0100 |
| commit | e431da674de493a2e1526ca368449917a0bebd39 (patch) | |
| tree | e507c793d791615b45e8a6a60ba9de3b015bc5b3 | |
| parent | e7b8a55aa7fca21d4fbf8a628045e922b26e2a53 (diff) | |
| download | chouette-core-e431da674de493a2e1526ca368449917a0bebd39.tar.bz2 | |
add select2 for rails
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/application.sass.erb | 4 |
4 files changed, 11 insertions, 0 deletions
@@ -22,6 +22,9 @@ gem 'jbuilder', '~> 2.0' # bundle exec rake doc:rails generates the API under doc/api. gem 'sdoc', '~> 0.4.0', group: :doc +# Select2 for pretty select boxes w. autocomplete +gem 'select2-rails', '~> 4.0', '>= 4.0.3' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring', group: :development # ActiveRecord associations on top of PostgreSQL arrays diff --git a/Gemfile.lock b/Gemfile.lock index 4d9e94fbd..88f36e3e6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -461,6 +461,8 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) + select2-rails (4.0.3) + thor (~> 0.14) shellany (0.0.1) shoulda-matchers (2.8.0) activesupport (>= 3.0.0) @@ -653,6 +655,7 @@ DEPENDENCIES sass-rails (~> 4.0.3) sawyer (~> 0.6.0) sdoc (~> 0.4.0) + select2-rails (~> 4.0, >= 4.0.3) shoulda-matchers sidekiq simple_form (~> 3.1.0) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 7193d0d21..198a0e2b6 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,6 +12,7 @@ //= require raphael //= require morrisjs //= require bootstrap-sass-official +//= require select2 //= require typeahead.js //= require jquery-tokeninput //= require moment diff --git a/app/assets/stylesheets/application.sass.erb b/app/assets/stylesheets/application.sass.erb index 5a0927b9d..d18ac0978 100644 --- a/app/assets/stylesheets/application.sass.erb +++ b/app/assets/stylesheets/application.sass.erb @@ -31,6 +31,10 @@ $body-bg: #eee @import 'eonasdan-bootstrap-datetimepicker' @import 'footable' +// Select2, themed w. Bootstrap +@import 'select2' +@import 'select2-bootstrap' + @import 'vendor/openlayers_style' @import 'vendor/openlayers_ie6-style' @import 'vendor/openlayers_google' |