diff options
| author | hellekin <hellekin@cepheide.org> | 2021-01-23 15:35:49 +0100 |
|---|---|---|
| committer | hellekin <hellekin@cepheide.org> | 2021-01-23 15:35:49 +0100 |
| commit | 73b3fffdbe730c33480682c40e7e8271e75ddf59 (patch) | |
| tree | 94c60464d43c6d39150802e8110cf51be2c326ee /app/views | |
| parent | b54d7d8aa172f85d53f44b601e4e81660d148342 (diff) | |
| download | incommon-map-73b3fffdbe730c33480682c40e7e8271e75ddf59.tar.gz | |
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...
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/application/_version.html.erb | 3 | ||||
| -rw-r--r-- | app/views/layouts/application.html.erb | 4 |
2 files changed, 6 insertions, 1 deletions
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 @@ +<div class="app-version" title="This is free software: you can access and acquire the source code"> + version <span><%= version_link %></span> +</div> 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 %> </head> @@ -28,6 +28,8 @@ <%= yield :aside %> </aside> <footer> + <hr> + <%= render partial: "application/version" %> <%= yield :footer %> </footer> <%= render partial: 'debug' %> |