From a735bec6b223fdfab940298631bb1cdf85264366 Mon Sep 17 00:00:00 2001 From: Henning Leutz <leutz@pcsg.de> Date: Thu, 23 Jul 2015 11:24:59 +0200 Subject: [PATCH] =?UTF-8?q?default=20css;=20Issue=20#264=20=C2=B7Issue=20#?= =?UTF-8?q?262?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/Editor.js | 10 ++++++---- bin/defaultWysiwyg.css | 11 +++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 bin/defaultWysiwyg.css diff --git a/bin/Editor.js b/bin/Editor.js index 63a3b14..e9100cd 100644 --- a/bin/Editor.js +++ b/bin/Editor.js @@ -210,25 +210,27 @@ define('package/quiqqer/ckeditor4/bin/Editor', [ }); } + data.cssFiles.push( + URL_OPT_DIR +'quiqqer/ckeditor4/bin/defaultWysiwyg.css' + ); + window.CKEDITOR.replace(instance, { + customConfig : '', language : Locale.getCurrent(), baseHref : URL_DIR, basePath : URL_DIR, height : height, width : width, toolbar : toolbar, - allowedContent : true, extraAllowedContent : 'div(*)[*]{*}, iframe(*)[*]{*}', - stylesSet : styles, - contentsCss : data.cssFiles || false, + contentsCss : data.cssFiles || [], bodyClass : data.bodyClass, // templates_files : [URL_OPT_DIR +'base/bin/pcsgEditorPlugins/templates.php'], baseFloatZIndex : zIndex, extraPlugins : 'abbr' }); - }, /** diff --git a/bin/defaultWysiwyg.css b/bin/defaultWysiwyg.css new file mode 100644 index 0000000..2eb0665 --- /dev/null +++ b/bin/defaultWysiwyg.css @@ -0,0 +1,11 @@ + +h1, +h2, +h3, +h4, +h5, +p { + float: none !important; + width: auto !important; +} + -- GitLab