diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b0c67ce0..6c2b2c4d 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -29,7 +29,6 @@ //= require morrisjs/morris.js //= require chartjs/Chart.bundle.js //= require fileinput.min -//= require turbolinks //= require cable //= require settings/processing_items //= require BSBMaterial/admin.js diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 70824f58..7bb2d879 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -12,6 +12,8 @@ @import "BSBMaterial/themes/all-themes"; @import "reset"; +/*@import "bootstrap-select/css/bootstrap-select.min";*/ + /*----- Order Processing Items -----*/ .opi_ul { display:block;