Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

50 shades of gray #160

Closed
wants to merge 3 commits into from
Closed

50 shades of gray #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3ba16c
Update plugin.js
mizafish Feb 3, 2015
6b8b7fc
Update colordialog.js
mizafish Feb 4, 2015
b0bb8c5
more gray colors
mizafish Feb 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions plugins/colordialog/dialogs/colordialog.js
View file
Open in desktop
Expand Up @@ -240,9 +240,11 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
appendColorCell( oRow.$, '#' + aColors[ n ] + aColors[ n ] + aColors[ n ] );
}

// Fill the row with black cells.
for ( var i = 0; i < 12; i++ ) {
appendColorCell( oRow.$, '#000000' );
// Fill the row with gray cells.
var n = aColors.length * 2 + 1,step = Math.ceil(256/n),cc = '';
for ( var i = 1; i < n; i++ ){
cc = (i * step ).toString(16);
appendColorCell( oRow.$, '#'+cc+cc+cc);
}
}

Expand Down
2 changes: 1 addition & 1 deletion plugins/dialogui/plugin.js
View file
Open in desktop
Expand Up @@ -157,7 +157,7 @@ CKEDITOR.plugins.add( 'dialogui', {
' for="' + _.inputId + '"' +
( elementDefinition.labelStyle ? ' style="' + elementDefinition.labelStyle + '"' : '' ) + '>' +
CKEDITOR.tools.htmlEncode( elementDefinition.label ) +
'</span>'
'</label>'
},
{
type: 'html',
Expand Down