Skip to content
Permalink
Browse files

Merge branch 't/16757'

  • Loading branch information...
mlewand committed Dec 28, 2016
2 parents 248e25f + 49a6288 commit 4b2c8f842e44e825bac12222eb8cbb63b2b59eab
Showing with 8 additions and 0 deletions.
  1. +8 −0 plugins/colorbutton/plugin.js
@@ -315,6 +315,14 @@ CKEDITOR.plugins.add( 'colorbutton', {
*
* config.colorButton_colors = 'FontColor1/FF9900,FontColor2/0066CC,FontColor3/F00';
*
* // CKEditor color palette available before 4.6.2 version.
* config.colorButton_colors =
* '000,800000,8B4513,2F4F4F,008080,000080,4B0082,696969,' +
* 'B22222,A52A2A,DAA520,006400,40E0D0,0000CD,800080,808080,' +
* 'F00,FF8C00,FFD700,008000,0FF,00F,EE82EE,A9A9A9,' +
* 'FFA07A,FFA500,FFFF00,00FF00,AFEEEE,ADD8E6,DDA0DD,D3D3D3,' +
* 'FFF0F5,FAEBD7,FFFFE0,F0FFF0,F0FFFF,F0F8FF,E6E6FA,FFF';
*
* @cfg {String} [colorButton_colors=see source]
* @member CKEDITOR.config
*/

0 comments on commit 4b2c8f8

Please sign in to comment.
You can’t perform that action at this time.