From b2d3a1d610c59db6c3ffc79c33f09f09f3e814e2 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Sun, 6 Jul 2014 17:06:59 +0200 Subject: [PATCH] Improved redactor integration, inherits WCF style and appearances --- com.woltlab.wcf/templates/wysiwyg.tpl | 2 +- .../js/3rdParty/redactor/plugins/wbbcode.js | 53 ++- .../3rdParty/redactor/plugins/wfontcolor.js | 11 +- .../3rdParty/redactor/plugins/wfontfamily.js | 61 ++-- .../js/3rdParty/redactor/plugins/wfontsize.js | 66 ++-- .../3rdParty/redactor/plugins/wmonkeypatch.js | 85 +---- wcfsetup/install/files/style/message.less | 160 --------- wcfsetup/install/files/style/redactor.less | 311 ++++++++++++++++++ 8 files changed, 449 insertions(+), 300 deletions(-) create mode 100644 wcfsetup/install/files/style/redactor.less diff --git a/com.woltlab.wcf/templates/wysiwyg.tpl b/com.woltlab.wcf/templates/wysiwyg.tpl index a109ef8202..648c0ce748 100644 --- a/com.woltlab.wcf/templates/wysiwyg.tpl +++ b/com.woltlab.wcf/templates/wysiwyg.tpl @@ -1,5 +1,5 @@ {if !$wysiwygEnableUpload|isset}{assign var=wysiwygEnableUpload value=false}{/if} - +{**}