Fix bootstrap in report [SCI-9085]

This commit is contained in:
Anton 2023-08-21 15:26:58 +02:00
parent 8f24e90ee4
commit 0161277380
6 changed files with 6 additions and 5 deletions

View file

@ -9,7 +9,6 @@ require('jquery-ui/ui/widgets/droppable');
require('jquery-ui/ui/effects/effect-slide');
require('hammerjs');
import 'bootstrap';
import './bootstrap.less';
require('bootstrap-select/js/bootstrap-select');
window.bwipjs = require('bwip-js');

View file

@ -12,7 +12,7 @@
<meta name="revive-url" content="<%= users_revive_session_path %>">
<% end %>
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'bootstrap_pack', media: 'all' %>
<%= stylesheet_link_tag 'application_pack_styles', media: 'all' %>
<% if ::NewRelic::Agent.instance.started? %>
<%= ::NewRelic::Agent.browser_timing_header(controller.request.content_security_policy_nonce) %>

View file

@ -6,6 +6,7 @@
<title><%=t "head.title", title: (yield :head_title) %></title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'bootstrap_pack', media: 'all' %>
<%= stylesheet_link_tag 'application', media: 'all' %>
<%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application' %>

View file

@ -10,7 +10,7 @@
html, body { height: 100%; min-height: 100%; }
</style>
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'bootstrap_pack', media: 'all' %>
<%= stylesheet_link_tag 'application_pack_styles', media: 'all' %>
<%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application' %>

View file

@ -4,6 +4,7 @@
<meta charset='utf-8' />
<%= wicked_pdf_stylesheet_link_tag "application" %>
<%= wicked_pdf_stylesheet_link_tag "reports_pdf" %>
<%= wicked_pdf_stylesheet_link_tag "bootstrap_pack" %>
<%= font_awesome_cdn_link_tag %>
<%= wicked_pdf_javascript_include_tag "jquery_bundle" %>
<%= wicked_pdf_javascript_include_tag "handsontable.full" %>

View file

@ -12,6 +12,7 @@ const mode = process.env.NODE_ENV === 'development' ? 'development' : 'productio
const entryList = {
application_pack: './app/javascript/packs/application.js',
application_pack_styles: './app/javascript/packs/application.scss',
bootstrap_pack: './app/javascript/packs/bootstrap.less',
emoji_button: './app/javascript/packs/emoji_button.js',
fontawesome: './app/javascript/packs/fontawesome.scss',
prism: './app/javascript/packs/prism.js',
@ -104,8 +105,7 @@ module.exports = {
{
test: /\.less$/i,
use: [
// compiles Less to CSS
"style-loader",
MiniCssExtractPlugin.loader,
"css-loader",
"less-loader",
],