Skip to content

Commit

Permalink
Merge branch 't/9655'
Browse files Browse the repository at this point in the history
  • Loading branch information
Reinmar committed Dec 21, 2012
2 parents b1ec0a6 + cd675f9 commit ed44860
Show file tree
Hide file tree
Showing 5 changed files with 106 additions and 3 deletions.
2 changes: 1 addition & 1 deletion plugins/dialog/plugin.js
Expand Up @@ -1971,7 +1971,7 @@ CKEDITOR.DIALOG_RESIZE_BOTH = 3;
'top:0;' +
'width:100%;' +
'height: 100%;' +
'progid:DXImageTransform.Microsoft.Alpha(opacity=0)">' +
'filter: progid:DXImageTransform.Microsoft.Alpha(opacity=0)">' +
'</iframe>' );
}

Expand Down
9 changes: 9 additions & 0 deletions skins/kama/editor_iequirks.css
Expand Up @@ -242,3 +242,12 @@ a.cke_dialog_ui_button_cancel span
font-size: 0;
}

.cke_colorbox
{
font-size: 0; /* Set minimal font size, so button won't be streched by the text that doesn't exist. */
}

.cke_source
{
white-space: normal;
}
21 changes: 21 additions & 0 deletions skins/moono/dialog_iequirks.css
@@ -0,0 +1,21 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

/*
dialog_ie7.css
===============
This file contains styles to used by Internet Explorer in
Quirks mode only.
*/

/* Base it on dialog_ie.css, overriding it with styles defined in this file. */
@import url("dialog_ie.css");

/* [IE7-8] Filter on footer causes background artifacts when opening dialog. */
.cke_dialog_footer
{
filter: ;
}
73 changes: 73 additions & 0 deletions skins/moono/editor_iequirks.css
@@ -0,0 +1,73 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

/*
editor_iequirks.css
===============
This file contains styles to used by all versions of Internet Explorer
in Quirks mode only.
*/

/* Base it on editor_ie.css, overriding it with styles defined in this file. */
@import url("editor_ie.css");

.cke_top,
.cke_contents,
.cke_bottom
{
width: 100%; /* hasLayout = true */
}

.cke_button_arrow
{
font-size: 0; /* Set minimal font size, so arrow won't be streched by the text that doesn't exist. */
}

/* Bring back toolbar buttons in RTL. */

.cke_rtl .cke_toolgroup,
.cke_rtl .cke_toolbar_separator,
.cke_rtl .cke_button,
.cke_rtl .cke_button *,
.cke_rtl .cke_combo,
.cke_rtl .cke_combo *,
.cke_rtl .cke_path_item,
.cke_rtl .cke_path_item *,
.cke_rtl .cke_path_empty
{
float: none;
}

.cke_rtl .cke_toolgroup,
.cke_rtl .cke_toolbar_separator,
.cke_rtl .cke_combo_button,
.cke_rtl .cke_combo_button *,
.cke_rtl .cke_button,
.cke_rtl .cke_button_icon,
{
display: inline-block;
vertical-align: top;
}

.cke_resizer
{
width: 10px;
}

.cke_source
{
white-space: normal;
}

.cke_bottom
{
position: static; /* Without this bottom space doesn't move when resizing editor. */
}

.cke_colorbox
{
font-size: 0; /* Set minimal font size, so button won't be streched by the text that doesn't exist. */
}
4 changes: 2 additions & 2 deletions skins/moono/skin.js
Expand Up @@ -54,8 +54,8 @@ CKEDITOR.skin.name = 'moono';
//
// The available browser specific files must be set separately for editor.css
// and dialog.css.
CKEDITOR.skin.ua_editor = 'ie,ie7,ie8,gecko';
CKEDITOR.skin.ua_dialog = 'ie,ie7,ie8,opera';
CKEDITOR.skin.ua_editor = 'ie,iequirks,ie7,ie8,gecko';
CKEDITOR.skin.ua_dialog = 'ie,iequirks,ie7,ie8,opera';

// 3. Define the "Chameleon" feature
// -----------------------------------
Expand Down

0 comments on commit ed44860

Please sign in to comment.