From 2daa9126d112db54eb7b075b3a2edb511f0f9c89 Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 7 Jul 2023 11:44:42 +0200 Subject: [PATCH] Small fixes for css bundling [SCI-8773] --- app/assets/stylesheets/application.sass.scss | 2 ++ app/views/layouts/application.html.erb | 2 +- app/views/layouts/sign_in_halt.html.erb | 2 +- bin/build-css | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss index d74b1026e..6e571f3f3 100644 --- a/app/assets/stylesheets/application.sass.scss +++ b/app/assets/stylesheets/application.sass.scss @@ -134,6 +134,8 @@ @import "system_notifications"; @import "tiny_mce"; +// Addons + body { font-family: "SN Inter", "Open Sans", Arial, Helvetica, sans-serif; } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0e904698d..142c7c3cd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@ <%= stylesheet_link_tag 'bootstrap', media: 'all' %> <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> <%= stylesheet_link_tag 'application', media: 'all' %> - <%= stylesheet_link_tag 'application_pack', media: 'all' %> + <%= stylesheet_link_tag 'application_pack_styles', media: 'all' %> <%= csp_meta_tag %> <% if ::NewRelic::Agent.instance.started? %> <%= ::NewRelic::Agent.browser_timing_header(controller.request.content_security_policy_nonce) %> diff --git a/app/views/layouts/sign_in_halt.html.erb b/app/views/layouts/sign_in_halt.html.erb index f5e511ae9..e0132ae97 100644 --- a/app/views/layouts/sign_in_halt.html.erb +++ b/app/views/layouts/sign_in_halt.html.erb @@ -15,7 +15,7 @@ <%= stylesheet_link_tag 'application_pack', media: 'all' %> <%= javascript_include_tag 'jquery_bundle' %> <%= javascript_include_tag 'application' %> - <%= javascript_include_tag 'application_pack' %> + <%= javascript_include_tag 'application_pack_styles' %> <%= favicon_link_tag "favicon.ico" %> <%= favicon_link_tag "favicon-16.png", type: "image/png", size: "16x16" %> diff --git a/bin/build-css b/bin/build-css index eebdc8677..bbe16ef9d 100755 --- a/bin/build-css +++ b/bin/build-css @@ -10,4 +10,5 @@ --no-source-map \ --load-path=node_modules \ --load-path=vendor/assets/stylesheets \ + --load-path=addons \ $@