From 7392079d4db432efc7a6db5744389933ddea7354 Mon Sep 17 00:00:00 2001 From: wandji20 Date: Mon, 12 Aug 2024 21:49:15 +0100 Subject: [PATCH] Move mail related styles to asset pipeline [OFN-12214] --- app/assets/stylesheets/mail.scss | 1 + app/assets/stylesheets/mail/all.scss | 3 +++ app/{webpacker/css => assets/stylesheets}/mail/email.scss | 0 .../css => assets/stylesheets}/mail/payments_list.scss | 0 app/webpacker/css/mail/all.scss | 3 --- app/webpacker/packs/mail.scss | 1 - config/application.rb | 1 + 7 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 app/assets/stylesheets/mail.scss create mode 100644 app/assets/stylesheets/mail/all.scss rename app/{webpacker/css => assets/stylesheets}/mail/email.scss (100%) rename app/{webpacker/css => assets/stylesheets}/mail/payments_list.scss (100%) delete mode 100644 app/webpacker/css/mail/all.scss delete mode 100644 app/webpacker/packs/mail.scss diff --git a/app/assets/stylesheets/mail.scss b/app/assets/stylesheets/mail.scss new file mode 100644 index 0000000000..e35654c0d2 --- /dev/null +++ b/app/assets/stylesheets/mail.scss @@ -0,0 +1 @@ +@import './mail/all.scss'; diff --git a/app/assets/stylesheets/mail/all.scss b/app/assets/stylesheets/mail/all.scss new file mode 100644 index 0000000000..fa8445d726 --- /dev/null +++ b/app/assets/stylesheets/mail/all.scss @@ -0,0 +1,3 @@ +@import '../../../webpacker/css/admin/globals/palette.scss'; +@import 'email'; +@import 'payments_list'; diff --git a/app/webpacker/css/mail/email.scss b/app/assets/stylesheets/mail/email.scss similarity index 100% rename from app/webpacker/css/mail/email.scss rename to app/assets/stylesheets/mail/email.scss diff --git a/app/webpacker/css/mail/payments_list.scss b/app/assets/stylesheets/mail/payments_list.scss similarity index 100% rename from app/webpacker/css/mail/payments_list.scss rename to app/assets/stylesheets/mail/payments_list.scss diff --git a/app/webpacker/css/mail/all.scss b/app/webpacker/css/mail/all.scss deleted file mode 100644 index 087d2d1310..0000000000 --- a/app/webpacker/css/mail/all.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import '../admin/globals/palette.scss'; -@import 'email'; -@import 'payments_list'; diff --git a/app/webpacker/packs/mail.scss b/app/webpacker/packs/mail.scss deleted file mode 100644 index d4f981e355..0000000000 --- a/app/webpacker/packs/mail.scss +++ /dev/null @@ -1 +0,0 @@ -@import "../css/mail/all.scss"; diff --git a/config/application.rb b/config/application.rb index 09d8fb5abe..420da2392a 100644 --- a/config/application.rb +++ b/config/application.rb @@ -216,6 +216,7 @@ module Openfoodnetwork config.assets.precompile += ['web/all.js'] config.assets.precompile += ['darkswarm/all.js'] config.assets.precompile += ['shared/*'] + config.assets.precompile += %w(mail.scss) config.assets.precompile += ['*.jpg', '*.jpeg', '*.png', '*.gif' '*.svg'] # Highlight code that triggered database queries in logs.