From 5c8adbe618480b08a4793f6dd37a42fdecfc5104 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 23 Oct 2017 15:49:55 +0630
Subject: [PATCH] remove no need crm js

---
 app/assets/javascripts/CRM.js          | 1 -
 app/assets/stylesheets/settings.scss   | 8 ++++----
 app/views/layouts/application.html.erb | 6 +-----
 config/initializers/assets.rb          | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/CRM.js b/app/assets/javascripts/CRM.js
index 4b5baba8..ede5946b 100644
--- a/app/assets/javascripts/CRM.js
+++ b/app/assets/javascripts/CRM.js
@@ -18,5 +18,4 @@
 //= require cable
 //= require jquery-ui
 //= require bootstrap-datepicker
-//= require bootstrap/modal
 
diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss
index 79781790..0205c7f3 100644
--- a/app/assets/stylesheets/settings.scss
+++ b/app/assets/stylesheets/settings.scss
@@ -3,10 +3,10 @@
 @import "theme";
 
 /* Show it is fixed to the top */
-// body {
-//   min-height: 75rem;
-//   padding-top: 4.5rem;
-// }
+/* body {
+   min-height: 75rem;
+   padding-top: 4.5rem;
+ }*/
 
 .setting_nav{
 	background-color: #2f5663;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 5a31b84f..41f4971a 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -21,11 +21,7 @@
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
     <%= stylesheet_link_tag    'settings', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <!-- oqs -->
-    <!--  <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %> -->
-    <!-- crm -->
-    <!-- <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>-->
-    <!-- JS -->  
+    
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
     
     <%= stylesheet_link_tag    'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 357ab350..48ff05d8 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -24,7 +24,7 @@ Rails.application.config.assets.precompile += %w( fileinput.min.css )
 
 # --- Customer/ Customer - Crm ----
 Rails.application.config.assets.precompile += %w( CRM.css )
-Rails.application.config.assets.precompile += %w( CRM.js )
+#Rails.application.config.assets.precompile += %w( CRM.js )
 
 # --- Customer/ Customer - Crm ----
 Rails.application.config.assets.precompile += %w( jquery-confirm.css )