aboutsummaryrefslogtreecommitdiff
path: root/app/javascript/packs
diff options
context:
space:
mode:
authorhellekin <hellekin@cepheide.org>2021-01-23 15:35:49 +0100
committerhellekin <hellekin@cepheide.org>2021-01-23 15:35:49 +0100
commit73b3fffdbe730c33480682c40e7e8271e75ddf59 (patch)
tree94c60464d43c6d39150802e8110cf51be2c326ee /app/javascript/packs
parentb54d7d8aa172f85d53f44b601e4e81660d148342 (diff)
downloadincommon-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/javascript/packs')
-rw-r--r--app/javascript/packs/application.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index 721b8c1..0ddfdb5 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -7,7 +7,6 @@ require("@rails/ujs").start()
require("turbolinks").start()
require("@rails/activestorage").start()
-
// Uncomment to copy all static images under ../images to the output folder and reference
// them with the image_pack_tag helper in views (e.g <%= image_pack_tag 'rails.png' %>)
// or the `imagePath` JavaScript helper below.
@@ -15,11 +14,12 @@ require("@rails/activestorage").start()
// const images = require.context('../images', true)
// const imagePath = (name) => images(name, true)
+import "../scss/application"
+
//= require leaflet
//= require leaflet-defaulticon-compatibility
//= require leaflet.markercluster
import "controllers"
-import "fork-awesome/scss/fork-awesome"
-import "fork-awesome/fonts/forkawesome-webfont"
-import "stylesheets/application"
+
+