From 0f6858041125c972095a21c727e0f53725381bc4 Mon Sep 17 00:00:00 2001 From: Sunandar Date: Sat, 25 Feb 2017 13:13:21 +0630 Subject: [PATCH] add new multiselect css and js --- Gemfile | 2 +- Gemfile.lock | 3 --- app/assets/.DS_Store | Bin 6148 -> 6148 bytes app/assets/javascripts/application.js | 3 +-- app/assets/stylesheets/application.scss | 3 +-- app/views/layouts/application.html.erb | 2 ++ 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Gemfile b/Gemfile index 4feee0b..2a9087d 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ gem 'bcrypt', '~> 3.1.7' gem 'simple_form' gem 'kaminari' gem 'to_csv-rails' -gem 'bootstrap-multiselect-rails' +# gem 'bootstrap-multiselect-rails' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console diff --git a/Gemfile.lock b/Gemfile.lock index 71ee041..d9c7620 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,8 +42,6 @@ GEM sshkit (>= 1.6.1, != 1.7.0) arel (7.1.4) bcrypt (3.1.11) - bootstrap-multiselect-rails (0.9.9) - rails (>= 4.0.0) builder (3.2.3) byebug (9.0.6) capistrano (3.7.2) @@ -222,7 +220,6 @@ PLATFORMS DEPENDENCIES bcrypt (~> 3.1.7) - bootstrap-multiselect-rails byebug capistrano capistrano-bundler diff --git a/app/assets/.DS_Store b/app/assets/.DS_Store index 5abf0cdff43543207d66c32d64def2e989516659..6b56a5d51ea6b2853f6a23bd1fe41b5d59629618 100644 GIT binary patch delta 20 ccmZoMXfc>@oRM+kMKkt^4V;_VIsWnk08q>aX#fBK delta 18 acmZoMXfc>@d}50F#s`w@o7p-3@&f=$0S8+E diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 29f4a47..1c4e0b8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,6 +13,5 @@ //= require jquery //= require jquery_ujs //= require turbolinks -//= require bootstrap.v4a2.min -//= require bootstrap-multiselect +//= require bootstrap.v4a2.min //= require_tree . diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3124c3d..c84e3e3 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -13,5 +13,4 @@ *= require_tree . *= require_self */ - @import "bootstrap.v4a2.min"; - @import "bootstrap-multiselect"; \ No newline at end of file + @import "bootstrap.v4a2.min"; \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ce5d9db..da94ae9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,8 @@ <%= csrf_meta_tags %> <%= stylesheet_link_tag 'application', media: 'all' %> <%= javascript_include_tag 'application', 'data-turbolinks-eval' => true %> + +