From 39f0f56af725f3f84877c7c72fb0bed958fb38f1 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Mon, 3 Jan 2022 20:22:27 +0000 Subject: [PATCH] Rename admin css pack It looks like Webpacker can get confused sometimes when packs with different formats have the same name (eg: admin.js and admin.scss)... --- app/views/spree/admin/shared/_head.html.haml | 2 +- app/webpacker/packs/{admin.scss => admin-styles.scss} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename app/webpacker/packs/{admin.scss => admin-styles.scss} (100%) diff --git a/app/views/spree/admin/shared/_head.html.haml b/app/views/spree/admin/shared/_head.html.haml index e4879fc4bf..a9dac3c874 100644 --- a/app/views/spree/admin/shared/_head.html.haml +++ b/app/views/spree/admin/shared/_head.html.haml @@ -11,7 +11,7 @@ %link{:href => "//fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,400,600&subset=latin,cyrillic,greek,vietnamese", :rel => "stylesheet", :type => "text/css"} -= stylesheet_pack_tag 'admin' += stylesheet_pack_tag 'admin-styles' = render "layouts/bugsnag_js" = javascript_include_tag 'admin/all' diff --git a/app/webpacker/packs/admin.scss b/app/webpacker/packs/admin-styles.scss similarity index 100% rename from app/webpacker/packs/admin.scss rename to app/webpacker/packs/admin-styles.scss