From 9237d9b3145d2bfa681cdbd861ae27ba267164b4 Mon Sep 17 00:00:00 2001 From: Andreas Nedbal Date: Fri, 25 Dec 2020 16:22:44 +0100 Subject: [PATCH] Fix sprockets crashing because of removed gems --- app/assets/stylesheets/application.scss | 9 +-------- app/javascript/packs/legacy/application.coffee | 5 +++++ app/javascript/packs/legacy/moderation/index.coffee | 4 +++- app/views/layouts/base.haml | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5b033152..955695de 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,9 +1,5 @@ /* *= require rails_bootstrap_forms - *= require growl - *= require jquery.guillotine - *= require sweetalert - *= require jquery.minicolors *= require flags *= require_self */ @@ -26,10 +22,7 @@ @import "bootstrap", -"tempusdominus-bootstrap-4", -"font-awesome", -"nprogress", -"nprogress-bootstrap"; +"font-awesome"; /** OVERRIDES diff --git a/app/javascript/packs/legacy/application.coffee b/app/javascript/packs/legacy/application.coffee index ae15ed98..e75efdb2 100644 --- a/app/javascript/packs/legacy/application.coffee +++ b/app/javascript/packs/legacy/application.coffee @@ -13,6 +13,11 @@ import NProgress from 'nprogress' import Cookies from 'js-cookie' import moment from 'moment' +require('nprogress/nprogress.css') +require('jquery.growl/stylesheets/jquery.growl.css') +require('jquery.guillotine/css/jquery.guillotine.css') +require('sweetalert/dist/sweetalert.css') + # this file is generated by Rails import I18n from './i18n' diff --git a/app/javascript/packs/legacy/moderation/index.coffee b/app/javascript/packs/legacy/moderation/index.coffee index 33d58e2c..a9d21d6c 100644 --- a/app/javascript/packs/legacy/moderation/index.coffee +++ b/app/javascript/packs/legacy/moderation/index.coffee @@ -1,9 +1,11 @@ import 'tempusdominus-bootstrap-4' +require('tempusdominus-bootstrap-4/build/css/tempusdominus-bootstrap-4.css') + import './ban' import './comment' import './destroy' import './privileges' import './vote' -$('.datetimepicker-input').datetimepicker({}); \ No newline at end of file +$('.datetimepicker-input').datetimepicker({}) \ No newline at end of file diff --git a/app/views/layouts/base.haml b/app/views/layouts/base.haml index 1f5994ce..ad3507a5 100644 --- a/app/views/layouts/base.haml +++ b/app/views/layouts/base.haml @@ -13,6 +13,7 @@ = javascript_include_tag 'i18n', data: { 'turbolinks-track': true } = stylesheet_link_tag 'application', media: 'all', data: { 'turbolinks-track': true } = javascript_pack_tag 'legacy/application', data: { 'turbolinks-track': true } + = stylesheet_pack_tag 'legacy/application', data: { 'turbolinks-track': true } - if user_signed_in? && current_user.mod? = javascript_pack_tag 'legacy/moderation/index', data: { 'turbolinks-track': true } = csrf_meta_tags