Merge branch 'master' into documentmeeting

This commit is contained in:
Andreas Stephanides
2014-12-18 07:50:16 +01:00
5 changed files with 12 additions and 4 deletions

View File

@@ -23,7 +23,7 @@ heading_clear_tag: p
width: "100%"
content_css: "/assets/tinymce.css"
toolbar:
- styleselect | bold boldred_btn italic forecolor | list link image table | undo redo | fullscreen code
- styleselect removeformat | bold boldred_btn italic forecolor | list link image table | bullist numlist | alignleft aligncenter alignright alignjustify | undo redo | fullscreen code
formats:
boldred: {selector: "p",block: "p", classes: "mc-important"}
setup: function(ed) {