From 255221f6658b866098cfa3e766b19661216c6b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Wed, 19 Dec 2012 15:53:23 +0100 Subject: [PATCH 1/4] IE quirks style fixes for Moono skin. --- skins/moono/dialog_iequirks.css | 15 ++++++++++ skins/moono/editor_iequirks.css | 53 +++++++++++++++++++++++++++++++++ skins/moono/skin.js | 4 +-- 3 files changed, 70 insertions(+), 2 deletions(-) create mode 100644 skins/moono/dialog_iequirks.css create mode 100644 skins/moono/editor_iequirks.css diff --git a/skins/moono/dialog_iequirks.css b/skins/moono/dialog_iequirks.css new file mode 100644 index 00000000000..a723f3db282 --- /dev/null +++ b/skins/moono/dialog_iequirks.css @@ -0,0 +1,15 @@ +/* +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"); \ No newline at end of file diff --git a/skins/moono/editor_iequirks.css b/skins/moono/editor_iequirks.css new file mode 100644 index 00000000000..6f8620f8cbf --- /dev/null +++ b/skins/moono/editor_iequirks.css @@ -0,0 +1,53 @@ +/* +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; +} diff --git a/skins/moono/skin.js b/skins/moono/skin.js index ae898c230f1..e7b4b7fdfc0 100644 --- a/skins/moono/skin.js +++ b/skins/moono/skin.js @@ -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 // ----------------------------------- From 8f098555ac575080e2353b3ef202de7333b45271 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Thu, 20 Dec 2012 16:09:08 +0100 Subject: [PATCH 2/4] Removed filter to avoid artifacts when opening dialog. --- skins/moono/dialog_iequirks.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/skins/moono/dialog_iequirks.css b/skins/moono/dialog_iequirks.css index a723f3db282..0103f55ea7a 100644 --- a/skins/moono/dialog_iequirks.css +++ b/skins/moono/dialog_iequirks.css @@ -12,4 +12,10 @@ Quirks mode only. */ /* Base it on dialog_ie.css, overriding it with styles defined in this file. */ -@import url("dialog_ie.css"); \ No newline at end of file +@import url("dialog_ie.css"); + +/* [IE7-8] Filter on footer causes background artifacts when opening dialog. */ +.cke_dialog_footer +{ + filter: ; +} From 085205a576cce7a55d77e6b9e801703b39c67e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Thu, 20 Dec 2012 16:29:50 +0100 Subject: [PATCH 3/4] IE9 QM - display transparent cover under dialog. --- plugins/dialog/plugin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/dialog/plugin.js b/plugins/dialog/plugin.js index a529b359a27..4c2f8119fd1 100644 --- a/plugins/dialog/plugin.js +++ b/plugins/dialog/plugin.js @@ -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)">' + '' ); } From cd675f9774032aef8de7b25cb8952fd2f2b4bf52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Reinmar=20Koszuli=C5=84ski?= Date: Thu, 20 Dec 2012 17:14:04 +0100 Subject: [PATCH 4/4] Few more fixes for Quirks Mode. --- skins/kama/editor_iequirks.css | 9 +++++++++ skins/moono/editor_iequirks.css | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/skins/kama/editor_iequirks.css b/skins/kama/editor_iequirks.css index 9bd301936b4..f853782d742 100644 --- a/skins/kama/editor_iequirks.css +++ b/skins/kama/editor_iequirks.css @@ -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; +} diff --git a/skins/moono/editor_iequirks.css b/skins/moono/editor_iequirks.css index 6f8620f8cbf..fc5c89d2191 100644 --- a/skins/moono/editor_iequirks.css +++ b/skins/moono/editor_iequirks.css @@ -51,3 +51,23 @@ in Quirks mode only. 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. */ +} \ No newline at end of file