diff --git a/lib/assets/javascripts/utils/tinymce.js b/lib/assets/javascripts/utils/tinymce.js index 1e5529b..e783cde 100644 --- a/lib/assets/javascripts/utils/tinymce.js +++ b/lib/assets/javascripts/utils/tinymce.js @@ -29,6 +29,7 @@ target_list: false, autoresize_min_height: 130, autoresize_bottom_margin: 10, + branding: false, extended_valid_elements: 'iframe[tooltip] , a[href|target=_blank]', paste_auto_cleanup_on_paste: true, paste_remove_styles: true, diff --git a/lib/assets/webpack.config.js b/lib/assets/webpack.config.js index 3dd0436..651ba9c 100644 --- a/lib/assets/webpack.config.js +++ b/lib/assets/webpack.config.js @@ -47,7 +47,7 @@ }), }, { - test: /(?:fonts\/.*)|(?:font-awesome\/fonts\/.*)(?:\.woff2?$|\.ttf$|\.eot$|\.svg$)/, + test: /(?:fonts\/bootstrap\/.*)|(?:font-awesome\/fonts\/.*)|(?:customfonts\/fonts\/.*)(?:\.woff2?$|\.ttf$|\.eot$|\.svg$|\.woff$)/, use: [ { loader: 'file-loader',