git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove no need crm js

Browse Source
This commit is contained in:
Yan
2017-10-23 15:49:55 +06:30
parent 4cda67b967
commit 5c8adbe618
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/CRM.js
View File

@@ -18,5 +18,4 @@
//= require cable //= require cable
//= require jquery-ui //= require jquery-ui
//= require bootstrap-datepicker //= require bootstrap-datepicker
//= require bootstrap/modal

8
app/assets/stylesheets/settings.scss
View File

@@ -3,10 +3,10 @@
@import "theme"; @import "theme";
/* Show it is fixed to the top */ /* Show it is fixed to the top */
// body { /* body {
// min-height: 75rem; min-height: 75rem;
// padding-top: 4.5rem; padding-top: 4.5rem;
// } }*/
.setting_nav{ .setting_nav{
background-color: #2f5663; background-color: #2f5663;

6
app/views/layouts/application.html.erb
View File

@@ -21,11 +21,7 @@
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'settings', 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' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>

2
config/initializers/assets.rb
View File

@@ -24,7 +24,7 @@ Rails.application.config.assets.precompile += %w( fileinput.min.css )
# --- Customer/ Customer - Crm ---- # --- Customer/ Customer - Crm ----
Rails.application.config.assets.precompile += %w( CRM.css ) 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 ---- # --- Customer/ Customer - Crm ----
Rails.application.config.assets.precompile += %w( jquery-confirm.css ) Rails.application.config.assets.precompile += %w( jquery-confirm.css )