scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-18 15:13:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5735 from aignatov-bio/ai-sci-8773-migrate-to-css-bundling

Browse source 
Small fixes for css bundling [SCI-8773]
This commit is contained in:
aignatov-bio 2023-07-07 15:47:42 +02:00 committed by GitHub
commit 51f47614eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/application.sass.scss
View file

@ -134,6 +134,8 @@
@import "system_notifications"; @import "system_notifications";
@import "tiny_mce"; @import "tiny_mce";
// Addons
body { body {
font-family: "SN Inter", "Open Sans", Arial, Helvetica, sans-serif; font-family: "SN Inter", "Open Sans", Arial, Helvetica, sans-serif;
} }

2
app/views/layouts/application.html.erb
View file

@ -13,7 +13,7 @@
<%= stylesheet_link_tag 'bootstrap', media: 'all' %> <%= stylesheet_link_tag 'bootstrap', media: 'all' %>
<%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %> <%= stylesheet_link_tag "tailwind", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag 'application', media: 'all' %> <%= stylesheet_link_tag 'application', media: 'all' %>
<%= stylesheet_link_tag 'application_pack', media: 'all' %> <%= stylesheet_link_tag 'application_pack_styles', media: 'all' %>
<%= csp_meta_tag %> <%= csp_meta_tag %>
<% if ::NewRelic::Agent.instance.started? %> <% if ::NewRelic::Agent.instance.started? %>
<%= ::NewRelic::Agent.browser_timing_header(controller.request.content_security_policy_nonce) %> <%= ::NewRelic::Agent.browser_timing_header(controller.request.content_security_policy_nonce) %>

2
app/views/layouts/sign_in_halt.html.erb
View file

@ -15,7 +15,7 @@
<%= stylesheet_link_tag 'application_pack', media: 'all' %> <%= stylesheet_link_tag 'application_pack', media: 'all' %>
<%= javascript_include_tag 'jquery_bundle' %> <%= javascript_include_tag 'jquery_bundle' %>
<%= javascript_include_tag 'application' %> <%= javascript_include_tag 'application' %>
<%= javascript_include_tag 'application_pack' %> <%= javascript_include_tag 'application_pack_styles' %>
<%= favicon_link_tag "favicon.ico" %> <%= favicon_link_tag "favicon.ico" %>
<%= favicon_link_tag "favicon-16.png", type: "image/png", size: "16x16" %> <%= favicon_link_tag "favicon-16.png", type: "image/png", size: "16x16" %>

1
bin/build-css
View file

@ -10,4 +10,5 @@
--no-source-map \ --no-source-map \
--load-path=node_modules \ --load-path=node_modules \
--load-path=vendor/assets/stylesheets \ --load-path=vendor/assets/stylesheets \
--load-path=addons \
$@ $@