composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2271: Upgrade CKEditor to v4.11.4

Browse Source
This commit is contained in:
Stephen Abello
2019-06-24 15:52:26 +02:00
parent e68340273b
commit 71f5d29cba
223 changed files with 3202 additions and 2607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/ckeditor/styles.js
View File

@@ -1,6 +1,6 @@
/**
* Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
* Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
*/
// This file contains style definitions that can be used by CKEditor plugins.
@@ -13,7 +13,7 @@
// ignore it. Otherwise it is strongly recommended to customize this file to match your
// website requirements and design properly.
//
// For more information refer to: http://docs.ckeditor.com/#!/guide/dev_styles-section-style-rules
// For more information refer to: https://ckeditor.com/docs/ckeditor4/latest/guide/dev_styles.html#style-rules
CKEDITOR.stylesSet.add( 'default', [
/* Block styles */
@@ -40,7 +40,7 @@ CKEDITOR.stylesSet.add( 'default', [
element: 'div',
styles: {
padding: '5px 10px',
'background-color': '#eee',
background: '#eee',
border: '1px solid #ccc'
}
},
@@ -59,9 +59,7 @@ CKEDITOR.stylesSet.add( 'default', [
{ name: 'Superscript', element: 'sup' },
*/
{ name: 'Underline', element: 'u' },
{ name: 'Marker', element: 'span', styles: { 'background-color': '#ff0' } },
{ name: 'Marker', element: 'span', attributes: { 'class': 'marker' } },
{ name: 'Big', element: 'big' },
{ name: 'Small', element: 'small' },
@@ -128,7 +126,7 @@ CKEDITOR.stylesSet.add( 'default', [
{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
// Adding space after the style name is an intended workaround. For now, there
// is no option to create two styles with the same name for different widget types. See http://dev.ckeditor.com/ticket/16664.
// is no option to create two styles with the same name for different widget types. See https://dev.ckeditor.com/ticket/16664.
{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },