From daa7cca8665921d0886d647432b8a281ccb0ce19 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Tue, 2 Mar 2021 22:50:04 +0100 Subject: [PATCH] Adjust import to include shared/* between Darkswarm and admin - Import joyride css file - Used by question-mark-with-tooltip used in admin part --- app/assets/javascripts/admin/all.js | 3 +++ app/assets/javascripts/darkswarm/all.js.coffee | 2 ++ app/assets/stylesheets/darkswarm/all.scss | 2 ++ 3 files changed, 7 insertions(+) diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 6f0dc8bbd4..f28f55565a 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -52,6 +52,9 @@ //= require admin/spree/handlebar_extensions // OFN specific +//= require ../shared/shared +//= require_tree ../shared/directives +//= require_tree ../templates/shared //= require_tree ../templates/admin //= require ./admin_ofn //= require ./customers/customers diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee index e7a53a9268..30b5d19c07 100644 --- a/app/assets/javascripts/darkswarm/all.js.coffee +++ b/app/assets/javascripts/darkswarm/all.js.coffee @@ -19,6 +19,8 @@ #= require ../shared/ng-infinite-scroll.min.js #= require ../shared/angular-local-storage.js #= require ../shared/angular-slideables.js +#= require ../shared/shared +#= require_tree ../shared/directives #= require angularjs-file-upload #= require i18n/translations diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss index 7698726035..2a7eefd1e9 100644 --- a/app/assets/stylesheets/darkswarm/all.scss +++ b/app/assets/stylesheets/darkswarm/all.scss @@ -21,3 +21,5 @@ ofn-modal { display: block; } + +@import "../shared/question-mark-icon";