From ce8215a3cb28ff5e751a1bee773832dd5a20b924 Mon Sep 17 00:00:00 2001 From: CactusPuppy Date: Wed, 28 Apr 2021 23:07:13 -0700 Subject: [PATCH] Revert "Commit to using Yarn over NPM" This reverts commit dd6a2600e7da1fef21e1c228ce55c62b7e61c6a6. --- app/assets/javascripts/application.js | 2 +- app/assets/stylesheets/application.css | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 075f9c11..18c5d6f6 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -55,7 +55,7 @@ //= require bootstrap-select //= require osem-survey //= require pagy -//= require @fullcalendar/common/main.js +//= require fullcalendar-scheduler/main.js $(document).ready(function() { $('a[disabled=disabled]').click(function(event){ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index f5c58982..520eedbe 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -26,4 +26,6 @@ *= require osem-navbar *= require mastodon *= require conferences + + *= require fullcalendar-scheduler/main.css */