From 4f37c3b20ca474e3a7edd3d6d6e5d63dd430573a Mon Sep 17 00:00:00 2001 From: f1ames Date: Mon, 18 Jul 2016 09:41:08 +0200 Subject: [PATCH 01/12] Colorbutton plugin improvements. # Conflicts: # plugins/colorbutton/plugin.js --- plugins/colorbutton/plugin.js | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/plugins/colorbutton/plugin.js b/plugins/colorbutton/plugin.js index bd8270722cd..5dbe77501f5 100644 --- a/plugins/colorbutton/plugin.js +++ b/plugins/colorbutton/plugin.js @@ -165,6 +165,7 @@ CKEDITOR.plugins.add( 'colorbutton', { function renderColors( panel, type, colorBoxId ) { var output = [], colors = config.colorButton_colors.split( ',' ), + colorsPerRow = config.colorButton_colorsPerRow || 6, // Tells if we should include "More Colors..." button. moreColorsEnabled = editor.plugins.colordialog && config.colorButton_enableMore !== false, // aria-setsize and aria-posinset attributes are used to indicate size of options, because @@ -226,10 +227,7 @@ CKEDITOR.plugins.add( 'colorbutton', { ' role="option" aria-posinset="1" aria-setsize="', total, '">' + '' + '' + - '' + - '' + + '' + '' + '
' + - '' + - '', lang.auto, '', lang.auto, '
' + '' ); @@ -238,7 +236,7 @@ CKEDITOR.plugins.add( 'colorbutton', { // Render the color boxes. for ( var i = 0; i < colors.length; i++ ) { - if ( ( i % 8 ) === 0 ) + if ( ( i % colorsPerRow ) === 0 ) output.push( '' ); var parts = colors[ i ].split( '/' ), @@ -306,6 +304,9 @@ CKEDITOR.plugins.add( 'colorbutton', { * a name and the slash character. For example, `'FontColor1/FF9900'` will be * displayed as the color `#FF9900` in the selector, but will be output as `'FontColor1'`. * + * **Since 4.6.0:** The default color palette has change. It contains less colors and in more + * pastel shades than the previous one. + * * Read more in the [documentation](#!/guide/dev_colorbutton) * and see the [SDK sample](http://sdk.ckeditor.com/samples/colorbutton.html). * @@ -317,11 +318,10 @@ CKEDITOR.plugins.add( 'colorbutton', { * @cfg {String} [colorButton_colors=see source] * @member CKEDITOR.config */ -CKEDITOR.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'; +CKEDITOR.config.colorButton_colors = '1ABC9C,2ECC71,3498DB,9B59B6,34495E,F1C40F,' + + '16A085,27AE60,2980B9,8E44AD,2C3E50,F39C12,' + + 'E67E22,E74C3C,ECF0F1,95A5A6,DDD,FFF,' + + 'D35400,C0392B,BDC3C7,7F8C8D,999,000'; /** * Stores the style definition that applies the text foreground color. @@ -378,6 +378,18 @@ CKEDITOR.config.colorButton_backStyle = { * @member CKEDITOR.config */ +/** + * Defines how many colors will be shown per row in the color selectors. + * + * Read more in the [documentation](#!/guide/dev_colorbutton) + * and see the [SDK sample](http://sdk.ckeditor.com/samples/colorbutton.html). + * + * config.colorButton_colorsPerRow = 8; + * + * @cfg {Number} [colorButton_colorsPerRow=6] + * @member CKEDITOR.config + */ + /** * Whether the plugin should convert `background` CSS properties with color only, to a `background-color` property, * allowing the [Color Button](http://ckeditor.com/addon/colorbutton) plugin to edit these styles. From dd962908a9dc2eee23a64a49c3422eb6555021d9 Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 16 Dec 2016 12:51:31 +0100 Subject: [PATCH 02/12] Updated docs to target 4.6.2 release. --- plugins/colorbutton/plugin.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/colorbutton/plugin.js b/plugins/colorbutton/plugin.js index 5dbe77501f5..5bc7b4f5a8f 100644 --- a/plugins/colorbutton/plugin.js +++ b/plugins/colorbutton/plugin.js @@ -304,7 +304,7 @@ CKEDITOR.plugins.add( 'colorbutton', { * a name and the slash character. For example, `'FontColor1/FF9900'` will be * displayed as the color `#FF9900` in the selector, but will be output as `'FontColor1'`. * - * **Since 4.6.0:** The default color palette has change. It contains less colors and in more + * **Since 4.6.2:** The default color palette has change. It contains less colors and in more * pastel shades than the previous one. * * Read more in the [documentation](#!/guide/dev_colorbutton) @@ -386,6 +386,7 @@ CKEDITOR.config.colorButton_backStyle = { * * config.colorButton_colorsPerRow = 8; * + * @since 4.6.2 * @cfg {Number} [colorButton_colorsPerRow=6] * @member CKEDITOR.config */ From ca18da0a82b1f245690d743765e8181fe98cde2d Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 16 Dec 2016 13:06:51 +0100 Subject: [PATCH 03/12] Make sure that other colorbutton ui parts also respect colorButton_colorsPerRow config variable. --- plugins/colorbutton/plugin.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/colorbutton/plugin.js b/plugins/colorbutton/plugin.js index 5bc7b4f5a8f..27b9ceb69f8 100644 --- a/plugins/colorbutton/plugin.js +++ b/plugins/colorbutton/plugin.js @@ -227,7 +227,7 @@ CKEDITOR.plugins.add( 'colorbutton', { ' role="option" aria-posinset="1" aria-setsize="', total, '">' + '' + '' + - '' + + '' + '' + '
', lang.auto, '', lang.auto, '
' + '' ); @@ -265,7 +265,7 @@ CKEDITOR.plugins.add( 'colorbutton', { if ( moreColorsEnabled ) { output.push( '' + '' + - '' + + '' + ' Date: Fri, 16 Dec 2016 13:12:17 +0100 Subject: [PATCH 04/12] Added a manual test. --- .../colorbutton/manual/colorsPerRow.html | 16 ++++++++++++++++ .../plugins/colorbutton/manual/colorsPerRow.md | 17 +++++++++++++++++ 2 files changed, 33 insertions(+) create mode 100644 tests/plugins/colorbutton/manual/colorsPerRow.html create mode 100644 tests/plugins/colorbutton/manual/colorsPerRow.md diff --git a/tests/plugins/colorbutton/manual/colorsPerRow.html b/tests/plugins/colorbutton/manual/colorsPerRow.html new file mode 100644 index 00000000000..83d5f0d07b7 --- /dev/null +++ b/tests/plugins/colorbutton/manual/colorsPerRow.html @@ -0,0 +1,16 @@ +

Editor 1

+ + +

Editor 2

+
+

Apollo 11 was the spaceflight that landed the first humans, Americans Neil Armstrong and Buzz Aldrin, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.

+
+ + diff --git a/tests/plugins/colorbutton/manual/colorsPerRow.md b/tests/plugins/colorbutton/manual/colorsPerRow.md new file mode 100644 index 00000000000..14a3f0056a8 --- /dev/null +++ b/tests/plugins/colorbutton/manual/colorsPerRow.md @@ -0,0 +1,17 @@ +@bender-tags: 16733, tc, 4.6.2, config +@bender-ui: collapsed +@bender-ckeditor-plugins: wysiwygarea, toolbar, colorbutton, colordialog, floatingspace + +### Scenario 1: + +1. Click *Text Color* button in Editor 1. + * **Expected**: It has 10 colors in each row. +1. Click *Background Color* button in Editor 1. + * **Expected**: It has 10 colors in each row. + +### Scenario 2: + +1. Click *Text Color* button in Editor 2. + * **Expected**: It has 6 colors in each row. +1. Click *Background Color* button in Editor 2. + * **Expected**: It has 6 colors in each row. From 44dae4b491e7b5c9c22f6a35cfdd14c95f262fae Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 16 Dec 2016 13:55:53 +0100 Subject: [PATCH 05/12] Added labels for new colors. --- plugins/colorbutton/lang/en.js | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/plugins/colorbutton/lang/en.js b/plugins/colorbutton/lang/en.js index a28aec9ae29..18bd09aceca 100644 --- a/plugins/colorbutton/lang/en.js +++ b/plugins/colorbutton/lang/en.js @@ -45,7 +45,29 @@ CKEDITOR.plugins.setLang( 'colorbutton', 'en', { F0FFFF: 'Azure', F0F8FF: 'Alice Blue', E6E6FA: 'Lavender', - FFF: 'White' + FFF: 'White', + '1ABC9C': 'Turquoise', + '2ECC71': 'Emerald', + '3498DB': 'Bright blue', + '9B59B6': 'Amethyst', + '34495E': 'Dark desaturated blue', + 'F1C40F': 'Vivid yellow', + '16A085': 'Green Sea', + '27AE60': 'Lime green', + '2980B9': 'Strong blue', + '8E44AD': 'Wisteria', + '2C3E50': 'Midnight Blue', + 'F39C12': 'Orange', + 'E67E22': 'Carrot', + 'E74C3C': 'Pale red', + 'ECF0F1': 'Light grayish cyan', + '95A5A6': 'Dark grayish cyan', + 'DDD': 'Very light gray', + 'D35400': 'Pumpkin', + 'C0392B': 'Strong red', + 'BDC3C7': 'Silver', + '7F8C8D': 'Darker grayish cyan', + '999': 'Dark gray' }, more: 'More Colors...', panelTitle: 'Colors', From 7551117a133cb52a214fd7ada8890c5a653dc8e3 Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 16 Dec 2016 16:24:13 +0100 Subject: [PATCH 06/12] Updated color names. One of blue colors got lightened up as it was not different enough from the other one. --- plugins/colorbutton/lang/en.js | 12 ++++++------ plugins/colorbutton/plugin.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/colorbutton/lang/en.js b/plugins/colorbutton/lang/en.js index 18bd09aceca..5f6041c48d6 100644 --- a/plugins/colorbutton/lang/en.js +++ b/plugins/colorbutton/lang/en.js @@ -50,19 +50,19 @@ CKEDITOR.plugins.setLang( 'colorbutton', 'en', { '2ECC71': 'Emerald', '3498DB': 'Bright blue', '9B59B6': 'Amethyst', - '34495E': 'Dark desaturated blue', + '4E5F70': 'Grayish blue', 'F1C40F': 'Vivid yellow', - '16A085': 'Green Sea', + '16A085': 'Dark Turquoise', '27AE60': 'Lime green', '2980B9': 'Strong blue', - '8E44AD': 'Wisteria', - '2C3E50': 'Midnight Blue', + '8E44AD': 'Dark violet', + '2C3E50': 'Desaturated blue', 'F39C12': 'Orange', 'E67E22': 'Carrot', 'E74C3C': 'Pale red', - 'ECF0F1': 'Light grayish cyan', + 'ECF0F1': 'Bright silver', '95A5A6': 'Dark grayish cyan', - 'DDD': 'Very light gray', + 'DDD': 'Light gray', 'D35400': 'Pumpkin', 'C0392B': 'Strong red', 'BDC3C7': 'Silver', diff --git a/plugins/colorbutton/plugin.js b/plugins/colorbutton/plugin.js index 27b9ceb69f8..8294601f4c0 100644 --- a/plugins/colorbutton/plugin.js +++ b/plugins/colorbutton/plugin.js @@ -318,7 +318,7 @@ CKEDITOR.plugins.add( 'colorbutton', { * @cfg {String} [colorButton_colors=see source] * @member CKEDITOR.config */ -CKEDITOR.config.colorButton_colors = '1ABC9C,2ECC71,3498DB,9B59B6,34495E,F1C40F,' + +CKEDITOR.config.colorButton_colors = '1ABC9C,2ECC71,3498DB,9B59B6,4E5F70,F1C40F,' + '16A085,27AE60,2980B9,8E44AD,2C3E50,F39C12,' + 'E67E22,E74C3C,ECF0F1,95A5A6,DDD,FFF,' + 'D35400,C0392B,BDC3C7,7F8C8D,999,000'; From 17ee4a5201eb64a4a024183da83d59e0cb04be25 Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 16 Dec 2016 16:29:15 +0100 Subject: [PATCH 07/12] Unified letter casing, adjusted cyan names. --- plugins/colorbutton/lang/en.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/colorbutton/lang/en.js b/plugins/colorbutton/lang/en.js index 5f6041c48d6..2e5f8812642 100644 --- a/plugins/colorbutton/lang/en.js +++ b/plugins/colorbutton/lang/en.js @@ -48,26 +48,26 @@ CKEDITOR.plugins.setLang( 'colorbutton', 'en', { FFF: 'White', '1ABC9C': 'Turquoise', '2ECC71': 'Emerald', - '3498DB': 'Bright blue', + '3498DB': 'Bright Blue', '9B59B6': 'Amethyst', - '4E5F70': 'Grayish blue', - 'F1C40F': 'Vivid yellow', + '4E5F70': 'Grayish Blue', + 'F1C40F': 'Vivid Yellow', '16A085': 'Dark Turquoise', - '27AE60': 'Lime green', - '2980B9': 'Strong blue', - '8E44AD': 'Dark violet', - '2C3E50': 'Desaturated blue', + '27AE60': 'Lime Green', + '2980B9': 'Strong Blue', + '8E44AD': 'Dark Violet', + '2C3E50': 'Desaturated Blue', 'F39C12': 'Orange', 'E67E22': 'Carrot', - 'E74C3C': 'Pale red', - 'ECF0F1': 'Bright silver', - '95A5A6': 'Dark grayish cyan', - 'DDD': 'Light gray', + 'E74C3C': 'Pale Red', + 'ECF0F1': 'Bright Silver', + '95A5A6': 'Light Grayish Cyan', + 'DDD': 'Light Gray', 'D35400': 'Pumpkin', - 'C0392B': 'Strong red', + 'C0392B': 'Strong Red', 'BDC3C7': 'Silver', - '7F8C8D': 'Darker grayish cyan', - '999': 'Dark gray' + '7F8C8D': 'Grayish Cyan', + '999': 'Dark Gray' }, more: 'More Colors...', panelTitle: 'Colors', From 74f7869996de128ca5326d220e55304c9a7aa552 Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Fri, 16 Dec 2016 19:17:50 +0100 Subject: [PATCH 08/12] Added translation metadata for new colors in color button plugin. --- .../meta/ckeditor.plugin-colorbutton/meta.txt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt b/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt index e44a75604a8..35dfc05d5ce 100644 --- a/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt +++ b/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt @@ -43,6 +43,28 @@ colors.F0FFFF = Tooltip with a human-readable name for the #F0FFFF color. colors.F0F8FF = Tooltip with a human-readable name for the #F0F8FF color. colors.E6E6FA = Tooltip with a human-readable name for the #E6E6FA color. colors.FFF = Tooltip with a human-readable name for the #FFF color. +colors.1ABC9C = Tooltip with a human-readable name for Turquoise (#1ABC9C) color. +colors.2ECC71 = Tooltip with a human-readable name for Emerald (#2ECC71) color. +colors.3498DB = Tooltip with a human-readable name for Bright Blue (#3498DB) color. +colors.9B59B6 = Tooltip with a human-readable name for Amethyst (#9B59B6) color. +colors.4E5F70 = Tooltip with a human-readable name for Grayish Blue (#4E5F70) color. +colors.F1C40F = Tooltip with a human-readable name for Vivid Yellow (#F1C40F) color. +colors.16A085 = Tooltip with a human-readable name for Dark Turquoise (#16A085) color. +colors.27AE60 = Tooltip with a human-readable name for Lime Green (#27AE60) color. +colors.2980B9 = Tooltip with a human-readable name for Strong Blue (#2980B9) color. +colors.8E44AD = Tooltip with a human-readable name for Dark Violet (#8E44AD) color. +colors.2C3E50 = Tooltip with a human-readable name for Desaturated Blue (#2C3E50) color. +colors.F39C12 = Tooltip with a human-readable name for Orange (#F39C12) color. +colors.E67E22 = Tooltip with a human-readable name for Carrot (#E67E22) color. +colors.E74C3C = Tooltip with a human-readable name for Pale Red (#E74C3C) color. +colors.ECF0F1 = Tooltip with a human-readable name for Bright Silver (#ECF0F1) color. +colors.95A5A6 = Tooltip with a human-readable name for Light Grayish Cyan (#95A5A6) color. +colors.DDD = Tooltip with a human-readable name for Light Gray (#DDD) color. +colors.D35400 = Tooltip with a human-readable name for Pumpkin (#D35400) color. +colors.C0392B = Tooltip with a human-readable name for Strong Red (#C0392B) color. +colors.BDC3C7 = Tooltip with a human-readable name for Silver (#BDC3C7) color. +colors.7F8C8D = Tooltip with a human-readable name for Grayish Cyan (#7F8C8D) color. +colors.999 = Tooltip with a human-readable name for Dark Gray (#999) color. more = panelTitle = textColorTitle = From 19bb25eedc4827ee9390e672be4d6ff057458cfe Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Thu, 22 Dec 2016 11:23:54 +0100 Subject: [PATCH 09/12] Updated with final colors list. --- plugins/colorbutton/lang/en.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/colorbutton/lang/en.js b/plugins/colorbutton/lang/en.js index 2e5f8812642..6669e2eda36 100644 --- a/plugins/colorbutton/lang/en.js +++ b/plugins/colorbutton/lang/en.js @@ -46,14 +46,14 @@ CKEDITOR.plugins.setLang( 'colorbutton', 'en', { F0F8FF: 'Alice Blue', E6E6FA: 'Lavender', FFF: 'White', - '1ABC9C': 'Turquoise', + '1ABC9C': 'Strong cyan', '2ECC71': 'Emerald', '3498DB': 'Bright Blue', '9B59B6': 'Amethyst', '4E5F70': 'Grayish Blue', 'F1C40F': 'Vivid Yellow', - '16A085': 'Dark Turquoise', - '27AE60': 'Lime Green', + '16A085': 'Dark cyan', + '27AE60': 'Dark Emerald', '2980B9': 'Strong Blue', '8E44AD': 'Dark Violet', '2C3E50': 'Desaturated Blue', From d7c9e8392087cc5754ddd42bc9f0f7fa1b6ad106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Krzto=C5=84?= Date: Thu, 22 Dec 2016 11:51:37 +0100 Subject: [PATCH 10/12] Color names to upper case. Manual test additional note about color numbers. --- plugins/colorbutton/lang/en.js | 6 +++--- tests/plugins/colorbutton/manual/colorsPerRow.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/colorbutton/lang/en.js b/plugins/colorbutton/lang/en.js index 6669e2eda36..6dda69681d3 100644 --- a/plugins/colorbutton/lang/en.js +++ b/plugins/colorbutton/lang/en.js @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ @@ -46,13 +46,13 @@ CKEDITOR.plugins.setLang( 'colorbutton', 'en', { F0F8FF: 'Alice Blue', E6E6FA: 'Lavender', FFF: 'White', - '1ABC9C': 'Strong cyan', + '1ABC9C': 'Strong Cyan', '2ECC71': 'Emerald', '3498DB': 'Bright Blue', '9B59B6': 'Amethyst', '4E5F70': 'Grayish Blue', 'F1C40F': 'Vivid Yellow', - '16A085': 'Dark cyan', + '16A085': 'Dark Cyan', '27AE60': 'Dark Emerald', '2980B9': 'Strong Blue', '8E44AD': 'Dark Violet', diff --git a/tests/plugins/colorbutton/manual/colorsPerRow.md b/tests/plugins/colorbutton/manual/colorsPerRow.md index 14a3f0056a8..7c33c77c85a 100644 --- a/tests/plugins/colorbutton/manual/colorsPerRow.md +++ b/tests/plugins/colorbutton/manual/colorsPerRow.md @@ -5,9 +5,9 @@ ### Scenario 1: 1. Click *Text Color* button in Editor 1. - * **Expected**: It has 10 colors in each row. + * **Expected**: It has 10 colors in each row (except the last one which has 4). 1. Click *Background Color* button in Editor 1. - * **Expected**: It has 10 colors in each row. + * **Expected**: It has 10 colors in each row (except the last one which has 4). ### Scenario 2: From 9c67d8e2dcedc6d327491f3d9df07251f77eb9bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Krzto=C5=84?= Date: Thu, 22 Dec 2016 12:00:22 +0100 Subject: [PATCH 11/12] Translation metadata adjustments. --- .../meta/ckeditor.plugin-colorbutton/meta.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt b/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt index 35dfc05d5ce..e1cadf7af62 100644 --- a/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt +++ b/dev/langtool/meta/ckeditor.plugin-colorbutton/meta.txt @@ -1,8 +1,8 @@ # Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. # For licensing, see LICENSE.md or http://ckeditor.com/license -auto = -bgColorTitle = +auto = +bgColorTitle = colors.000 = Tooltip with a human-readable name for the #000 color. colors.800000 = Tooltip with a human-readable name for the #800000 color. colors.8B4513 = Tooltip with a human-readable name for the #8B4513 color. @@ -43,14 +43,14 @@ colors.F0FFFF = Tooltip with a human-readable name for the #F0FFFF color. colors.F0F8FF = Tooltip with a human-readable name for the #F0F8FF color. colors.E6E6FA = Tooltip with a human-readable name for the #E6E6FA color. colors.FFF = Tooltip with a human-readable name for the #FFF color. -colors.1ABC9C = Tooltip with a human-readable name for Turquoise (#1ABC9C) color. +colors.1ABC9C = Tooltip with a human-readable name for Strong Cyan (#1ABC9C) color. colors.2ECC71 = Tooltip with a human-readable name for Emerald (#2ECC71) color. colors.3498DB = Tooltip with a human-readable name for Bright Blue (#3498DB) color. colors.9B59B6 = Tooltip with a human-readable name for Amethyst (#9B59B6) color. colors.4E5F70 = Tooltip with a human-readable name for Grayish Blue (#4E5F70) color. colors.F1C40F = Tooltip with a human-readable name for Vivid Yellow (#F1C40F) color. -colors.16A085 = Tooltip with a human-readable name for Dark Turquoise (#16A085) color. -colors.27AE60 = Tooltip with a human-readable name for Lime Green (#27AE60) color. +colors.16A085 = Tooltip with a human-readable name for Dark Cyan (#16A085) color. +colors.27AE60 = Tooltip with a human-readable name for Dark Emerald (#27AE60) color. colors.2980B9 = Tooltip with a human-readable name for Strong Blue (#2980B9) color. colors.8E44AD = Tooltip with a human-readable name for Dark Violet (#8E44AD) color. colors.2C3E50 = Tooltip with a human-readable name for Desaturated Blue (#2C3E50) color. @@ -65,6 +65,6 @@ colors.C0392B = Tooltip with a human-readable name for Strong Red (#C0392B) colo colors.BDC3C7 = Tooltip with a human-readable name for Silver (#BDC3C7) color. colors.7F8C8D = Tooltip with a human-readable name for Grayish Cyan (#7F8C8D) color. colors.999 = Tooltip with a human-readable name for Dark Gray (#999) color. -more = -panelTitle = -textColorTitle = +more = +panelTitle = +textColorTitle = From 5d2849db1387a26b62a9ed82e7cd4744eb45906d Mon Sep 17 00:00:00 2001 From: Marek Lewandowski Date: Thu, 22 Dec 2016 13:39:35 +0100 Subject: [PATCH 12/12] Changelog entry. --- CHANGES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index 95dc717f661..992a5370785 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,10 @@ ## CKEditor 4.6.2 +New Features: + +* [#16733](http://dev.ckeditor.com/ticket/16733): Added new color palette for [Color Button](http://ckeditor.com/addon/colorbutton) plugin and added [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) option. + Fixed Issues: * [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.