diff --git a/.bootstraprc b/.bootstraprc index 1327a743..278db7d9 100644 --- a/.bootstraprc +++ b/.bootstraprc @@ -1,7 +1,6 @@ { "bootstrapVersion": 3, "styleLoaders": ["style", "css", "sass"], - "extractStyles": true, "styles": { "mixins": true, "grid": true, diff --git a/app/javascript/packs/create_new_offsite_payment_pane.js b/app/javascript/packs/create_new_offsite_payment_pane.js index 868f93d3..f1bab5de 100644 --- a/app/javascript/packs/create_new_offsite_payment_pane.js +++ b/app/javascript/packs/create_new_offsite_payment_pane.js @@ -1,3 +1,4 @@ // License: LGPL-3.0-or-later // require a root component here. This will be treated as the root of a webpack package +require('bootstrap-loader'); require('../../../javascripts/app/create_new_offsite_payment_pane') \ No newline at end of file diff --git a/app/javascript/packs/edit_payment_pane.js b/app/javascript/packs/edit_payment_pane.js index 6413bad9..3645948d 100644 --- a/app/javascript/packs/edit_payment_pane.js +++ b/app/javascript/packs/edit_payment_pane.js @@ -1,3 +1,4 @@ // License: LGPL-3.0-or-later // require a root component here. This will be treated as the root of a webpack package +require('bootstrap-loader'); require('../../../javascripts/app/edit_payment_pane') \ No newline at end of file diff --git a/app/javascript/packs/registration_page.js b/app/javascript/packs/registration_page.js index ed2bb0fd..6294388d 100644 --- a/app/javascript/packs/registration_page.js +++ b/app/javascript/packs/registration_page.js @@ -1,4 +1,5 @@ // License: LGPL-3.0-or-later - +require('../../../client/css/global/page.css') +require('bootstrap-loader'); require('../../../javascripts/app/registration_page') diff --git a/app/javascript/packs/session_login_page.js b/app/javascript/packs/session_login_page.js index 3ac3acc4..5d840db1 100644 --- a/app/javascript/packs/session_login_page.js +++ b/app/javascript/packs/session_login_page.js @@ -1,3 +1,3 @@ // License: LGPL-3.0-or-later - +require('bootstrap-loader'); require('../../../javascripts/app/session_login_page') \ No newline at end of file diff --git a/app/views/layouts/apified.html.erb b/app/views/layouts/apified.html.erb index 6dc8f0dd..198e5db5 100644 --- a/app/views/layouts/apified.html.erb +++ b/app/views/layouts/apified.html.erb @@ -15,8 +15,6 @@ <%= render 'layouts/stylesheets' %> - <%= IncludeAsset.css '/client/css/global/page.css' %> - <%= IncludeAsset.css '/client/css/bootstrap.css' %> <%= favicon_link_tag %>