From 73b3fffdbe730c33480682c40e7e8271e75ddf59 Mon Sep 17 00:00:00 2001 From: hellekin Date: Sat, 23 Jan 2021 15:35:49 +0100 Subject: Move CSS to Webpack Using both the asset pipeline and webpack is confusing and leads to unpredictable results in production. This commit moves all (S)CSS to Webpack under `app/javascript/scss` so that we can test whether the development interface results in a consistent production deployment. In order to load the ForkAwesome fonts we used a long path: `$fa-font-path: "../../../node_modules/fork-awesome/fonts";` Not sure whether this works... --- app/views/application/_version.html.erb | 3 +++ app/views/layouts/application.html.erb | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 app/views/application/_version.html.erb (limited to 'app/views') diff --git a/app/views/application/_version.html.erb b/app/views/application/_version.html.erb new file mode 100644 index 0000000..616cb82 --- /dev/null +++ b/app/views/application/_version.html.erb @@ -0,0 +1,3 @@ +
+ version <%= version_link %> +
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bc02585..bfdf530 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,7 @@ <%= csp_meta_tag %> <%= display_meta_tags site: 'IN COMMON Map' %> - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <%= stylesheet_pack_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> <%= yield :head %> @@ -28,6 +28,8 @@ <%= yield :aside %> <%= render partial: 'debug' %> -- cgit v1.2.3