Skip to content

Commit

Permalink
Merge branch 't/13637'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Aug 7, 2015
2 parents 7df5016 + bc07f9e commit 67c3355
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
Expand Up @@ -12,6 +12,10 @@ Fixed Issues:
* [#13386](http://dev.ckeditor.com/ticket/13386): [Edge] Fixed: Issues with selecting and editing images.
* [#13568](http://dev.ckeditor.com/ticket/13568): Fixed: Method [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) returns invalid results for entire content selection.

Other Changes:

* [#13637](https://dev.ckeditor.com/ticket/13637): Several icons were refactored.

## CKEditor 4.5.2

Fixed Issues:
Expand Down
Binary file modified plugins/forms/icons/hiddenfield.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/forms/images/hiddenfield.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/image/images/noimage.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugins/pagebreak/images/pagebreak.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions plugins/pagebreak/plugin.js
@@ -1,4 +1,4 @@
/**
/**
* @license Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved.
* For licensing, see LICENSE.md or http://ckeditor.com/license
*/
Expand Down Expand Up @@ -26,7 +26,7 @@
'border-top:#999 1px dotted;' +
'border-bottom:#999 1px dotted;' +
'padding:0;' +
'height:5px;' +
'height:7px;' +
'cursor:default;'
).replace( /;/g, ' !important;' ); // Increase specificity to override other styles, e.g. block outline.

Expand Down

0 comments on commit 67c3355

Please sign in to comment.