Skip to content
Permalink
Browse files

Merge branch 't/11757'

  • Loading branch information...
Reinmar committed Jun 13, 2014
2 parents a2cdb35 + c2266fc commit f5acc045fa905b2db12a445deeb69a059bbc49e5
@@ -9,9 +9,10 @@ Important Notes:

Fixed Issues:

* [#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)!
* [#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)!
* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to adapter configuration.
* [#10867](http://dev.ckeditor.com/ticket/10867): Fixed: Issue with setting encoded URI as image's link.
* [#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)!
* [#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.
* [#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).
* [#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.
@@ -309,7 +309,7 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
label: lang.selected,
labelStyle: 'display:none',
id: 'selectedColor',
style: 'width: 74px',
style: 'width: 76px;margin-top:4px',
onChange: function() {
// Try to update color preview with new value. If fails, then set it no none.
try {
@@ -323,7 +323,6 @@ CKEDITOR.dialog.add( 'colordialog', function( editor ) {
{
type: 'button',
id: 'clear',
style: 'margin-top: 5px',
label: lang.clear,
onClick: clearSelected
}
@@ -359,7 +359,7 @@
hidden: true,
// v-align with the 'src' field.
// TODO: We need something better than a fixed size here.
style: 'display:inline-block;margin-top:10px;',
style: 'display:inline-block;margin-top:14px;',
label: editor.lang.common.browseServer
}
]
@@ -516,7 +516,7 @@
id: 'browse',
// v-align with the 'txtUrl' field.
// TODO: We need something better than a fixed size here.
style: 'display:inline-block;margin-top:10px;',
style: 'display:inline-block;margin-top:14px;',
align: 'center',
label: editor.lang.common.browseServer,
hidden: true,
@@ -364,7 +364,7 @@ CKEDITOR.dialog.add( 'image2', function( editor ) {
id: 'browse',
// v-align with the 'txtUrl' field.
// TODO: We need something better than a fixed size here.
style: 'display:inline-block;margin-top:16px;',
style: 'display:inline-block;margin-top:14px;',
align: 'center',
label: editor.lang.common.browseServer,
hidden: true,
@@ -318,17 +318,26 @@ a.cke_dialog_tab_disabled
{
background-image: url(images/close.png);
background-repeat: no-repeat;
background-position: 0 0;
background-position: 50%;
position: absolute;
cursor: pointer;
text-align: center;
height: 20px;
width: 20px;
top: 5px;
z-index: 5;
opacity: 0.8;
filter: alpha(opacity = 80);
}

.cke_hidpi .cke_dialog_close_button {
.cke_dialog_close_button:hover
{
opacity: 1;
filter: alpha(opacity = 100);
}

.cke_hidpi .cke_dialog_close_button
{
background-image: url(images/hidpi/close.png);
background-size: 16px;
}
@@ -568,7 +577,7 @@ a.cke_dialog_ui_button
*display: inline;
*zoom: 1;

padding: 3px 0;
padding: 4px 0;
margin: 0;

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

span.cke_dialog_ui_button
{
padding: 0 12px;
padding: 0 10px;
}

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

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

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

select.cke_dialog_ui_input_select
{
height: 24px;
line-height: 24px;
height: 25px;
line-height: 25px;

background-color: #fff;
border: 1px solid #c9cccf;
border-top-color: #aeb3b9;
padding: 2px 6px;
padding: 3px 3px 3px 6px;

outline: none;

@@ -211,6 +211,7 @@ is its visual representation:
/* The title of the entire panel which is visible on top of the list. */
.cke_panel_grouptitle
{
cursor: default;
font-size: 11px;
font-weight: bold;
white-space: nowrap;
@@ -62,6 +62,7 @@ The visual representation of a rich combo widget looks as follows:
/* The container for combo text and arrow. */
.cke_combo_button
{
cursor: default;
display: inline-block;
float: left;
margin: 0 6px 5px 0;
@@ -203,6 +204,7 @@ The visual representation of a rich combo widget looks as follows:
/* The arrow which is displayed inside of the .cke_combo_open handler. */
.cke_combo_arrow
{
cursor: default;
margin: 11px 0 0;
float: left;

0 comments on commit f5acc04

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