From 10ea1a69bf5f868429b7ac1056cde94ab7630e58 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 1 Apr 2021 11:54:17 +0200 Subject: [PATCH] fix compatibility between embed fontawesome and simplemde --- assets/css/admin.scss | 2 +- assets/js/admin/simplemde.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/assets/css/admin.scss b/assets/css/admin.scss index 5eb8fd8..429dfb4 100644 --- a/assets/css/admin.scss +++ b/assets/css/admin.scss @@ -10,10 +10,10 @@ $pagination-bg: #ffffff; $pagination-active-color: #ffffff; $pagination-active-bg: #343a40; +@import "~simplemde/dist/simplemde.min.css"; @import "~choices.js/src/styles/choices.scss"; @import "~bootstrap/scss/bootstrap.scss"; @import "~@fortawesome/fontawesome-free/css/all.css"; -@import "~simplemde/dist/simplemde.min.css"; #logo { width: 30px; diff --git a/assets/js/admin/simplemde.js b/assets/js/admin/simplemde.js index a143563..bf168b6 100644 --- a/assets/js/admin/simplemde.js +++ b/assets/js/admin/simplemde.js @@ -9,7 +9,8 @@ module.exports = () => { new Editor({ element: element, - forceSync: true + forceSync: true, + autoDownloadFontAwesome: false, }) }) }