Changeset 3412

Timestamp:

04/22/09 08:12:57 (4 years ago)

Author:

martinkou

Message:

Fixed #3412 : Fixed incorrect dialog tab bar layout in IE6.

Location:

CKEditor/trunk/_source

Files:

• skins/office2003/dialog.css (modified) (7 diffs)
• skins/v2/dialog.css (modified) (7 diffs)
• themes/default/theme.js (modified) (1 diff)

CKEditor/trunk/_source/skins/office2003/dialog.css

@@ -123 +123 @@
         /* IE6 does not support full color transparent PNG. */
         _background-image: url(images/dialog_sides.gif);
+
+        /* IE quirks gets confused when we have both top and bottom. */
+        _top: auto;
 }
 
@@ -166 +169 @@
 }
 
-.cke_browser_ie.cke_skin_office2003 .cke_rtl .cke_dialog_title
+.cke_skin_office2003 .cke_browser_ie.cke_rtl .cke_dialog_title
 {
         position: static !important;
@@ -226 +229 @@
 
 /* Gecko 1.8 layout workaround. */
-.cke_browser_gecko18.cke_skin_office2003 a.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_office2003 a:link.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_office2003 a:active.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_office2003 a:hover.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_office2003 a:visited.cke_dialog_tab
+.cke_skin_office2003 .cke_browser_gecko18 a.cke_dialog_tab,
+.cke_skin_office2003 .cke_browser_gecko18 a:link.cke_dialog_tab,
+.cke_skin_office2003 .cke_browser_gecko18 a:active.cke_dialog_tab,
+.cke_skin_office2003 .cke_browser_gecko18 a:hover.cke_dialog_tab,
+.cke_skin_office2003 .cke_browser_gecko18 a:visited.cke_dialog_tab
 {
         display: inline;
@@ -349 +352 @@
 
 /* Gecko 1.8 does not support display: inline-block */
-.cke_browser_gecko18.cke_skin_office2003 .cke_dialog_footer_buttons span.cke_dialog_ui_button
+.cke_skin_office2003 .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
         display: block;
@@ -377 +380 @@
 
 /* Gecko 1.8 does not support for display: inline-table */
-.cke_browser_gecko18.cke_skin_office2003 .cke_dialog_footer_buttons
+.cke_skin_office2003 .cke_browser_gecko18 .cke_dialog_footer_buttons
 {
         display: inline;
@@ -422 +425 @@
 }
 
-.cke_browser_ie6.cke_skin_office2003 .cke_rtl .cke_dialog_close_button
+.cke_skin_office2003 .cke_browser_ie6.cke_rtl .cke_dialog_close_button
 {
         position: relative;
@@ -430 +433 @@
 }
 
-.cke_browser_iequirks.cke_skin_office2003 .cke_rtl.cke_single_page .cke_dialog_close_button
+.cke_skin_office2003 .cke_browser_iequirks.cke_rtl.cke_single_page .cke_dialog_close_button
 {
         margin-top: -32px;
 }
 
-.cke_browser_iequirks.cke_skin_office2003 .cke_ltr .cke_dialog_close_button
+.cke_skin_office2003 .cke_browser_iequirks.cke_ltr .cke_dialog_close_button
 {
         margin-top: 0;

CKEditor/trunk/_source/skins/v2/dialog.css

@@ -123 +123 @@
         /* IE6 does not support full color transparent PNG. */
         _background-image: url(images/dialog_sides.gif);
+
+        /* IE quirks gets confused when we have both top and bottom. */
+        _top: auto;
 }
 
@@ -163 +166 @@
 }
 
-.cke_browser_ie.cke_skin_v2 .cke_rtl .cke_dialog_title
+.cke_skin_v2 .cke_browser_ie.cke_rtl .cke_dialog_title
 {
         position: static !important;
@@ -223 +226 @@
 
 /* Gecko 1.8 layout workaround. */
-.cke_browser_gecko18.cke_skin_v2 a.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_v2 a:link.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_v2 a:active.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_v2 a:hover.cke_dialog_tab,
-.cke_browser_gecko18.cke_skin_v2 a:visited.cke_dialog_tab
+.cke_skin_v2 .cke_browser_gecko18 a.cke_dialog_tab,
+.cke_skin_v2 .cke_browser_gecko18 a:link.cke_dialog_tab,
+.cke_skin_v2 .cke_browser_gecko18 a:active.cke_dialog_tab,
+.cke_skin_v2 .cke_browser_gecko18 a:hover.cke_dialog_tab,
+.cke_skin_v2 .cke_browser_gecko18 a:visited.cke_dialog_tab
 {
         display: inline;
@@ -343 +346 @@
 
 /* Gecko 1.8 does not support display: inline-block */
-.cke_browser_gecko18.cke_skin_v2 .cke_dialog_footer_buttons span.cke_dialog_ui_button
+.cke_skin_v2 .cke_browser_gecko18 .cke_dialog_footer_buttons span.cke_dialog_ui_button
 {
         display: block;
@@ -371 +374 @@
 
 /* Gecko 1.8 does not support for display: inline-table */
-.cke_browser_gecko18.cke_skin_v2 .cke_dialog_footer_buttons
+.cke_skin_v2 .cke_browser_gecko18 .cke_dialog_footer_buttons
 {
         display: inline;
@@ -421 +424 @@
 }
 
-.cke_browser_ie6.cke_skin_v2 .cke_rtl .cke_dialog_close_button
+.cke_skin_v2 .cke_browser_ie6.cke_rtl .cke_dialog_close_button
 {
         position: relative;
@@ -429 +432 @@
 }
 
-.cke_browser_iequirks.cke_skin_v2 .cke_rtl.cke_single_page .cke_dialog_close_button
+.cke_skin_v2 .cke_browser_iequirks.cke_rtl.cke_single_page .cke_dialog_close_button
 {
         margin-top: -32px;
 }
 
-.cke_browser_iequirks.cke_skin_v2 .cke_ltr .cke_dialog_close_button
+.cke_skin_v2 .cke_browser_iequirks.cke_ltr .cke_dialog_close_button
 {
         margin-top: 0;

CKEditor/trunk/_source/themes/default/theme.js

@@ -94 +94 @@
                         var element = CKEDITOR.dom.element.createFromHtml( [
                                         '<div class="cke_skin_', editor.skinName,
-                                                ' ', CKEDITOR.env.cssClass,
                                                 '" dir="', editor.lang.dir, '">' +
 
-                                                '<div class="cke_dialog',
+                                                '<div class="cke_dialog', ' ' + CKEDITOR.env.cssClass,
                                                         ' cke_', editor.lang.dir, '" style="position:absolute">' +
                                                         '<div class="%body">' +