Merge branch 'dev'

3a8e4fd0 · Henning Leutz · 95600b2a · 936836e5 · 3a8e4fd0 · 3a8e4fd0
Commit 3a8e4fd0 erstellt 9 years ago von Henning Leutz
--- a/bin/Editor.css
+++ b/bin/Editor.css
@@ -42,8 +42,8 @@
    color: #FFFFFF;
 }

-.cke_dialog_contents [class^="icon-"],
-.cke_dialog_contents [class*=" icon-"] {
+.cke_dialog_contents [class^="fa-"],
+.cke_dialog_contents [class*=" fa-"] {
    font-family: FontAwesome;
    font-style: normal;
    font-weight: normal;

--- a/bin/Editor.js
+++ b/bin/Editor.js
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,6 @@

    "require": {
        "quiqqer/quiqqer" : "*",
-        "quiqqer/package-ckeditor4" : "4.*"
+        "ckeditor/ckeditor" : "4.5.*"
    }
 }