Upgrade CkEditor to version 4.7

This commit is contained in:
yflory
2017-06-20 10:03:13 +02:00
parent 2fb5e3ae35
commit f13d23241c
33 changed files with 14 additions and 591 deletions

View File

@@ -38,7 +38,7 @@ CKEDITOR.editorConfig = function( config ) {
//skin: 'moono-cryptpad,/pad/themes/moono-cryptpad/'
//skin: 'flat,/pad/themes/flat/'
config.skin= 'moono-lisa,/pad/themes/moono-lisa/'
//config.skin= 'moono-lisa,/pad/themes/moono-lisa/'
//skin: 'moono-dark,/pad/themes/moono-dark/'
//skin: 'office2013,/pad/themes/office2013/'
};

View File

@@ -28,7 +28,8 @@
box-sizing: border-box;
padding: 0px 6px;
background-color: #BBBBFF;
//background-color: #BBBBFF;
background-color: #FF0073;
.fa {
font: normal normal normal 14px/1 FontAwesome;

View File

@@ -101,7 +101,7 @@
.cryptpad-toolbar {
box-sizing: border-box;
padding: 0px 6px;
background-color: #BBBBFF;
background-color: #FF0073;
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;

View File

@@ -169,6 +169,9 @@ define(function () {
out.history_restoreDone = "Document restauré";
out.history_version = "Version :";
// Ckeditor links
out.openLinkInNewTab = "Ouvrir le lien dans un nouvel onglet";
// Polls
out.poll_title = "Sélecteur de date Zero Knowledge";

View File

@@ -171,6 +171,9 @@ define(function () {
out.history_restoreDone = "Document restored";
out.history_version = "Version:";
// Ckeditor links
out.openLinkInNewTab = "Open Link in New Tab";
// Polls
out.poll_title = "Zero Knowledge Date Picker";