Skip to content
Permalink
Browse files

Merge branch 't/16586' into major

  • Loading branch information...
mlewand committed Nov 2, 2016
2 parents 5404260 + 7a834e6 commit 89931223fe4aef00af8005e4d2d760b633afd4a1
Showing with 302 additions and 288 deletions.
  1. BIN plugins/about/icons/hidpi/about.png
  2. BIN plugins/basicstyles/icons/hidpi/bold.png
  3. BIN plugins/basicstyles/icons/hidpi/italic.png
  4. BIN plugins/basicstyles/icons/hidpi/strike.png
  5. BIN plugins/basicstyles/icons/hidpi/subscript.png
  6. BIN plugins/basicstyles/icons/hidpi/superscript.png
  7. BIN plugins/basicstyles/icons/hidpi/underline.png
  8. BIN plugins/bidi/icons/hidpi/bidiltr.png
  9. BIN plugins/bidi/icons/hidpi/bidirtl.png
  10. BIN plugins/blockquote/icons/hidpi/blockquote.png
  11. BIN plugins/clipboard/icons/hidpi/copy-rtl.png
  12. BIN plugins/clipboard/icons/hidpi/copy.png
  13. BIN plugins/clipboard/icons/hidpi/cut-rtl.png
  14. BIN plugins/clipboard/icons/hidpi/cut.png
  15. BIN plugins/clipboard/icons/hidpi/paste-rtl.png
  16. BIN plugins/clipboard/icons/hidpi/paste.png
  17. BIN plugins/codesnippet/icons/hidpi/codesnippet.png
  18. BIN plugins/colorbutton/icons/hidpi/bgcolor.png
  19. BIN plugins/colorbutton/icons/hidpi/textcolor.png
  20. BIN plugins/copyformatting/icons/copyformatting.png
  21. BIN plugins/copyformatting/icons/hidpi/copyformatting.png
  22. BIN plugins/div/icons/hidpi/creatediv.png
  23. BIN plugins/docprops/icons/hidpi/docprops-rtl.png
  24. BIN plugins/docprops/icons/hidpi/docprops.png
  25. BIN plugins/find/icons/hidpi/find-rtl.png
  26. BIN plugins/find/icons/hidpi/find.png
  27. BIN plugins/find/icons/hidpi/replace.png
  28. BIN plugins/flash/icons/hidpi/flash.png
  29. BIN plugins/forms/icons/hidpi/button.png
  30. BIN plugins/forms/icons/hidpi/checkbox.png
  31. BIN plugins/forms/icons/hidpi/form.png
  32. BIN plugins/forms/icons/hidpi/hiddenfield.png
  33. BIN plugins/forms/icons/hidpi/imagebutton.png
  34. BIN plugins/forms/icons/hidpi/radio.png
  35. BIN plugins/forms/icons/hidpi/select-rtl.png
  36. BIN plugins/forms/icons/hidpi/select.png
  37. BIN plugins/forms/icons/hidpi/textarea-rtl.png
  38. BIN plugins/forms/icons/hidpi/textarea.png
  39. BIN plugins/forms/icons/hidpi/textfield-rtl.png
  40. BIN plugins/forms/icons/hidpi/textfield.png
  41. BIN plugins/horizontalrule/icons/hidpi/horizontalrule.png
  42. BIN plugins/iframe/icons/hidpi/iframe.png
  43. BIN plugins/image/icons/hidpi/image.png
  44. BIN plugins/image2/icons/hidpi/image.png
  45. BIN plugins/indent/icons/hidpi/indent-rtl.png
  46. BIN plugins/indent/icons/hidpi/indent.png
  47. BIN plugins/indent/icons/hidpi/outdent-rtl.png
  48. BIN plugins/indent/icons/hidpi/outdent.png
  49. BIN plugins/justify/icons/hidpi/justifyblock.png
  50. BIN plugins/justify/icons/hidpi/justifycenter.png
  51. BIN plugins/justify/icons/hidpi/justifyleft.png
  52. BIN plugins/justify/icons/hidpi/justifyright.png
  53. BIN plugins/language/icons/hidpi/language.png
  54. BIN plugins/link/icons/hidpi/anchor-rtl.png
  55. BIN plugins/link/icons/hidpi/anchor.png
  56. BIN plugins/link/icons/hidpi/link.png
  57. BIN plugins/link/icons/hidpi/unlink.png
  58. BIN plugins/link/images/anchor.png
  59. BIN plugins/link/images/hidpi/anchor.png
  60. BIN plugins/list/icons/hidpi/bulletedlist-rtl.png
  61. BIN plugins/list/icons/hidpi/bulletedlist.png
  62. BIN plugins/list/icons/hidpi/numberedlist-rtl.png
  63. BIN plugins/list/icons/hidpi/numberedlist.png
  64. BIN plugins/maximize/icons/hidpi/maximize.png
  65. BIN plugins/newpage/icons/hidpi/newpage-rtl.png
  66. BIN plugins/newpage/icons/hidpi/newpage.png
  67. BIN plugins/pagebreak/icons/hidpi/pagebreak-rtl.png
  68. BIN plugins/pagebreak/icons/hidpi/pagebreak.png
  69. BIN plugins/pastefromword/icons/hidpi/pastefromword-rtl.png
  70. BIN plugins/pastefromword/icons/hidpi/pastefromword.png
  71. BIN plugins/pastetext/icons/hidpi/pastetext-rtl.png
  72. BIN plugins/pastetext/icons/hidpi/pastetext.png
  73. BIN plugins/placeholder/icons/hidpi/placeholder.png
  74. BIN plugins/preview/icons/hidpi/preview-rtl.png
  75. BIN plugins/preview/icons/hidpi/preview.png
  76. BIN plugins/print/icons/hidpi/print.png
  77. BIN plugins/removeformat/icons/hidpi/removeformat.png
  78. BIN plugins/save/icons/hidpi/save.png
  79. BIN plugins/selectall/icons/hidpi/selectall.png
  80. BIN plugins/showblocks/icons/hidpi/showblocks-rtl.png
  81. BIN plugins/showblocks/icons/hidpi/showblocks.png
  82. BIN plugins/smiley/icons/hidpi/smiley.png
  83. BIN plugins/sourcearea/icons/hidpi/source-rtl.png
  84. BIN plugins/sourcearea/icons/hidpi/source.png
  85. BIN plugins/sourcedialog/icons/hidpi/sourcedialog-rtl.png
  86. BIN plugins/sourcedialog/icons/hidpi/sourcedialog.png
  87. BIN plugins/specialchar/icons/hidpi/specialchar.png
  88. BIN plugins/table/icons/hidpi/table.png
  89. BIN plugins/templates/icons/hidpi/templates-rtl.png
  90. BIN plugins/templates/icons/hidpi/templates.png
  91. BIN plugins/uicolor/icons/hidpi/uicolor.png
  92. BIN plugins/undo/icons/hidpi/redo-rtl.png
  93. BIN plugins/undo/icons/hidpi/redo.png
  94. BIN plugins/undo/icons/hidpi/undo-rtl.png
  95. BIN plugins/undo/icons/hidpi/undo.png
  96. BIN skins/moono-lisa/dev/icons16.png
  97. +151 −147 skins/moono-lisa/dev/icons16.svg
  98. BIN skins/moono-lisa/dev/icons32.png
  99. +145 −137 skins/moono-lisa/dev/icons32.svg
  100. +2 −1 skins/moono-lisa/dev/locations.json
  101. BIN skins/moono-lisa/images/hidpi/close.png
  102. BIN skins/moono-lisa/images/hidpi/lock-open.png
  103. BIN skins/moono-lisa/images/hidpi/lock.png
  104. BIN skins/moono-lisa/images/hidpi/refresh.png
  105. +3 −2 skins/moono/dev/locations.json
  106. BIN skins/moono/icons/copyformatting.png
  107. BIN skins/moono/icons/hidpi/copyformatting.png
  108. +1 −1 skins/moono/skin.js
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN +0 Bytes (100%) plugins/find/icons/hidpi/find.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN +0 Bytes (100%) plugins/link/icons/hidpi/link.png
Diff not rendered.
Diff not rendered.
BIN -23 Bytes (97%) plugins/link/images/anchor.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN +0 Bytes (100%) plugins/save/icons/hidpi/save.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN +0 Bytes (100%) plugins/undo/icons/hidpi/redo.png
Diff not rendered.
Diff not rendered.
BIN +0 Bytes (100%) plugins/undo/icons/hidpi/undo.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
BIN +813 Bytes (100%) skins/moono-lisa/dev/icons32.png
Diff not rendered.
Diff not rendered.
@@ -102,7 +102,8 @@
"plugins/link/icons/link.png",
"plugins/link/icons/unlink.png",
"plugins/link/icons/anchor.png",
"plugins/link/icons/anchor-rtl.png"
"plugins/link/icons/anchor-rtl.png",
"plugins/copyformatting/icons/copyformatting.png"
],
"7": [
[
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
@@ -102,7 +102,8 @@
"plugins/link/icons/link.png",
"plugins/link/icons/unlink.png",
"plugins/link/icons/anchor.png",
"plugins/link/icons/anchor-rtl.png"
"plugins/link/icons/anchor-rtl.png",
"plugins/copyformatting/icons/copyformatting.png"
],
"7": [
[
@@ -141,4 +142,4 @@
"skins/moono/images/lock-open.png",
"skins/moono/images/refresh.png"
]
}
}
Diff not rendered.
Diff not rendered.
@@ -293,7 +293,7 @@ CKEDITOR.skin.chameleon = ( function() {
// The available icons. This list must match the file names (without
// extension) available inside the "icons" folder.
var icons = ( 'about,anchor-rtl,anchor,bgcolor,bidiltr,bidirtl,blockquote,' +
'bold,bulletedlist-rtl,bulletedlist,button,checkbox,copy-rtl,copy,' +
'bold,bulletedlist-rtl,bulletedlist,button,checkbox,copy-rtl,copy,copyformatting,' +
'creatediv,cut-rtl,cut,docprops-rtl,docprops,find-rtl,find,flash,form,' +
'hiddenfield,horizontalrule,icons,iframe,image,imagebutton,indent-rtl,' +
'indent,italic,justifyblock,justifycenter,justifyleft,justifyright,' +

0 comments on commit 8993122

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