Skip to content

Commit f5acc04

Browse files
committed
Merge branch 't/11757'
2 parents a2cdb35 + c2266fc commit f5acc04

File tree

8 files changed

+28
-15
lines changed

8 files changed

+28
-15
lines changed

CHANGES.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@ Important Notes:
99

1010
Fixed Issues:
1111

12+
* [#11757](http://dev.ckeditor.com/ticket/11757): Fixed: Imperfections in the [Moono](http://ckeditor.com/addon/moono) skin. Thanks to [danyaPostfactum](https://github.com/danyaPostfactum)!
13+
* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
1214
* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to adapter configuration.
1315
* [#10867](http://dev.ckeditor.com/ticket/10867): Fixed: Issue with setting encoded URI as image's link.
14-
* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
1516
* [#11983](http://dev.ckeditor.com/ticket/11983): Fixed: Clicking a nested widget does not focus it. Additionally, performance of the [`widget.repository.getByElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-getByElement) method has been improved.
1617
* [#12000](http://dev.ckeditor.com/ticket/12000): Fixed: Nested widgets should be initialized on [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) and [`nestedEditable.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable-method-setData).
1718
* [#12022](http://dev.ckeditor.com/ticket/12022): Fixed: Outer widget's drag handler is not created at all if it has any nested widgets inside.

plugins/colordialog/dialogs/colordialog.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
309309
label: lang.selected,
310310
labelStyle: 'display:none',
311311
id: 'selectedColor',
312-
style: 'width: 74px',
312+
style: 'width: 76px;margin-top:4px',
313313
onChange: function() {
314314
// Try to update color preview with new value. If fails, then set it no none.
315315
try {
@@ -323,7 +323,6 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
323323
{
324324
type: 'button',
325325
id: 'clear',
326-
style: 'margin-top: 5px',
327326
label: lang.clear,
328327
onClick: clearSelected
329328
}

plugins/flash/dialogs/flash.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
hidden: true,
360360
// v-align with the 'src' field.
361361
// TODO: We need something better than a fixed size here.
362-
style: 'display:inline-block;margin-top:10px;',
362+
style: 'display:inline-block;margin-top:14px;',
363363
label: editor.lang.common.browseServer
364364
}
365365
]

plugins/image/dialogs/image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@
516516
id: 'browse',
517517
// v-align with the 'txtUrl' field.
518518
// TODO: We need something better than a fixed size here.
519-
style: 'display:inline-block;margin-top:10px;',
519+
style: 'display:inline-block;margin-top:14px;',
520520
align: 'center',
521521
label: editor.lang.common.browseServer,
522522
hidden: true,

plugins/image2/dialogs/image2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
364364
id: 'browse',
365365
// v-align with the 'txtUrl' field.
366366
// TODO: We need something better than a fixed size here.
367-
style: 'display:inline-block;margin-top:16px;',
367+
style: 'display:inline-block;margin-top:14px;',
368368
align: 'center',
369369
label: editor.lang.common.browseServer,
370370
hidden: true,

skins/moono/dialog.css

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,17 +318,26 @@ a.cke_dialog_tab_disabled
318318
{
319319
background-image: url(images/close.png);
320320
background-repeat: no-repeat;
321-
background-position: 0 0;
321+
background-position: 50%;
322322
position: absolute;
323323
cursor: pointer;
324324
text-align: center;
325325
height: 20px;
326326
width: 20px;
327327
top: 5px;
328328
z-index: 5;
329+
opacity: 0.8;
330+
filter: alpha(opacity = 80);
329331
}
330332

331-
.cke_hidpi .cke_dialog_close_button {
333+
.cke_dialog_close_button:hover
334+
{
335+
opacity: 1;
336+
filter: alpha(opacity = 100);
337+
}
338+
339+
.cke_hidpi .cke_dialog_close_button
340+
{
332341
background-image: url(images/hidpi/close.png);
333342
background-size: 16px;
334343
}
@@ -568,7 +577,7 @@ a.cke_dialog_ui_button
568577
*display: inline;
569578
*zoom: 1;
570579

571-
padding: 3px 0;
580+
padding: 4px 0;
572581
margin: 0;
573582

574583
text-align: center;
@@ -600,7 +609,7 @@ a.cke_dialog_ui_button
600609

601610
span.cke_dialog_ui_button
602611
{
603-
padding: 0 12px;
612+
padding: 0 10px;
604613
}
605614

606615
a.cke_dialog_ui_button:hover
@@ -658,7 +667,8 @@ a.cke_dialog_ui_button[style*="width"]
658667
color: inherit;
659668
font-size: 12px;
660669
font-weight: bold;
661-
line-height: 20px;
670+
line-height: 18px;
671+
padding: 0 12px;
662672
}
663673

664674
/* Special class appended to the Ok button. */
@@ -714,7 +724,7 @@ a.cke_dialog_ui_button_cancel:focus,
714724
a.cke_dialog_ui_button_cancel:active
715725
{
716726
border-width: 2px;
717-
padding: 2px 0;
727+
padding: 3px 0;
718728
}
719729

720730
a.cke_dialog_ui_button_ok:focus,
@@ -753,13 +763,13 @@ div.cke_dialog_ui_input_select
753763

754764
select.cke_dialog_ui_input_select
755765
{
756-
height: 24px;
757-
line-height: 24px;
766+
height: 25px;
767+
line-height: 25px;
758768

759769
background-color: #fff;
760770
border: 1px solid #c9cccf;
761771
border-top-color: #aeb3b9;
762-
padding: 2px 6px;
772+
padding: 3px 3px 3px 6px;
763773

764774
outline: none;
765775

skins/moono/panel.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ is its visual representation:
211211
/* The title of the entire panel which is visible on top of the list. */
212212
.cke_panel_grouptitle
213213
{
214+
cursor: default;
214215
font-size: 11px;
215216
font-weight: bold;
216217
white-space: nowrap;

skins/moono/richcombo.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ The visual representation of a rich combo widget looks as follows:
6262
/* The container for combo text and arrow. */
6363
.cke_combo_button
6464
{
65+
cursor: default;
6566
display: inline-block;
6667
float: left;
6768
margin: 0 6px 5px 0;
@@ -203,6 +204,7 @@ The visual representation of a rich combo widget looks as follows:
203204
/* The arrow which is displayed inside of the .cke_combo_open handler. */
204205
.cke_combo_arrow
205206
{
207+
cursor: default;
206208
margin: 11px 0 0;
207209
float: left;
208210

0 commit comments

Comments
 (0)