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/javascript/packs/application.js | 8 +- app/javascript/scss/_agents.scss | 9 ++ app/javascript/scss/_categories.scss | 9 ++ app/javascript/scss/_resources.scss | 9 ++ app/javascript/scss/_sections.scss | 3 + app/javascript/scss/_taxonomies.scss | 44 +++++++ app/javascript/scss/_users.scss | 9 ++ app/javascript/scss/_welcome.scss | 10 ++ app/javascript/scss/application.scss | 35 ++++++ app/javascript/scss/components/_body.scss | 167 +++++++++++++++++++++++++ app/javascript/scss/components/_debug.scss | 18 +++ app/javascript/scss/components/_flash.scss | 35 ++++++ app/javascript/scss/components/_fonts.scss | 12 ++ app/javascript/scss/components/_footer.scss | 20 +++ app/javascript/scss/components/_header.scss | 34 +++++ app/javascript/scss/components/_index.scss | 8 ++ app/javascript/scss/components/_map.scss | 19 +++ app/javascript/scss/components/_user_info.scss | 70 +++++++++++ app/javascript/scss/taxonomies/_dewey.scss | 43 +++++++ 19 files changed, 558 insertions(+), 4 deletions(-) create mode 100644 app/javascript/scss/_agents.scss create mode 100644 app/javascript/scss/_categories.scss create mode 100644 app/javascript/scss/_resources.scss create mode 100644 app/javascript/scss/_sections.scss create mode 100644 app/javascript/scss/_taxonomies.scss create mode 100644 app/javascript/scss/_users.scss create mode 100644 app/javascript/scss/_welcome.scss create mode 100644 app/javascript/scss/application.scss create mode 100644 app/javascript/scss/components/_body.scss create mode 100644 app/javascript/scss/components/_debug.scss create mode 100644 app/javascript/scss/components/_flash.scss create mode 100644 app/javascript/scss/components/_fonts.scss create mode 100644 app/javascript/scss/components/_footer.scss create mode 100644 app/javascript/scss/components/_header.scss create mode 100644 app/javascript/scss/components/_index.scss create mode 100644 app/javascript/scss/components/_map.scss create mode 100644 app/javascript/scss/components/_user_info.scss create mode 100644 app/javascript/scss/taxonomies/_dewey.scss (limited to 'app/javascript') 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" + + diff --git a/app/javascript/scss/_agents.scss b/app/javascript/scss/_agents.scss new file mode 100644 index 0000000..ec9285d --- /dev/null +++ b/app/javascript/scss/_agents.scss @@ -0,0 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2020 IN COMMON Collective