Ticket #7332: 7332.patch

_source/plugins/colorbutton/plugin.js

@@ -159 +159 @@
                                                         '<td>' +
                                                                 '<span class="cke_colorbox" id="', colorBoxId, '"></span>' +
                                                         '</td>' +
-                                                        '<td colspan=7 align=center>',
+                                                        '<td align=center>',
                                                                 lang.auto,
                                                         '</td>' +
                                                 '</tr>' +
                                         '</table>' +
                                 '</a>' +
+
+                                ( CKEDITOR.env.ie && CKEDITOR.env.quirks ? '<div style="width: 100%; padding: 0px; margin: 0px;">' : '' ),
                                 '<table role="presentation" cellspacing=0 cellpadding=0 width="100%">' );
 
                         // Render the color boxes.
@@ -180 +182 @@
                                 // The data can be only a color code (without #) or colorName + color code
                                 // If only a color code is provided, then the colorName is the color with the hash
                                 // Convert the color from RGB to RRGGBB for better compatibility with IE and <font>. See #5676
-                                if (!parts[1])
+                                if ( !parts[1] )
                                         colorName = '#' + colorName.replace( /^(.)(.)(.)$/, '$1$1$2$2$3$3' );
 
                                 var colorLabel = editor.lang.colors[ colorCode ] || colorCode;
@@ -214 +216 @@
                         }
 
                         output.push( '</tr></table>' );
+                        CKEDITOR.env.ie && CKEDITOR.env.quirks && output.push( '</div>' );
 
                         return output.join( '' );
                 }

_source/skins/kama/panel.css

@@ -149 +149 @@
         height: 135px;
 }
 
+/* #7332 */
+.cke_colorblock, .cke_colorblock *
+{
+        font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
+        font-size: 11px;
+}
 .cke_colorblock
 {
         padding: 3px;
-   font-size: 11px;
-   font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
 }
 
 .cke_colorblock,
@@ -215 +219 @@
         border: #316ac5 1px solid;
         background-color: #dff1ff;
 }
+
+/* Quirks fixes #7332 */
+.cke_browser_iequirks span.cke_colorbox
+{
+        padding-left: 10px;
+        margin-right: 1px;
+}
+.cke_browser_iequirks.cke_rtl span.cke_colorbox
+{
+        padding-left: 0px;
+        padding-right: 10px;
+}
+.cke_browser_iequirks a.cke_colorauto
+{
+        width: 99.9%;
+}
+ No newline at end of file

_source/skins/office2003/panel.css

@@ -144 +144 @@
         height: 135px;
 }
 
+.cke_colorblock, .cke_colorblock *
+{
+        font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
+        font-size: 11px;
+}
 .cke_colorblock
 {
         padding: 3px;
-   font-size: 11px;
-   font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
 }
 
 .cke_colorblock,
@@ -210 +213 @@
         border: #316ac5 1px solid;
         background-color: #dff1ff;
 }
+
+/* Quirks fixes #7332 */
+.cke_browser_iequirks span.cke_colorbox
+{
+        padding-left: 10px;
+        margin-right: 1px;
+}
+.cke_browser_iequirks.cke_rtl span.cke_colorbox
+{
+        padding-left: 0px;
+        padding-right: 10px;
+}
+.cke_browser_iequirks a.cke_colorauto
+{
+        width: 99.9%;
+}
+ No newline at end of file

_source/skins/v2/panel.css

@@ -144 +144 @@
         height: 135px;
 }
 
+/* #7332 */
+.cke_colorblock, .cke_colorblock *
+{
+        font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
+        font-size: 11px;
+}
 .cke_colorblock
 {
         padding: 3px;
-        font-size: 11px;
-        font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;
 }
 
 .cke_colorblock,
@@ -210 +214 @@
         border: #316ac5 1px solid;
         background-color: #dff1ff;
 }
+
+/* Quirks fixes #7332 */
+.cke_browser_iequirks span.cke_colorbox
+{
+        padding-left: 10px;
+        margin-right: 1px;
+}
+.cke_browser_iequirks.cke_rtl span.cke_colorbox
+{
+        padding-left: 0px;
+        padding-right: 10px;
+}
+.cke_browser_iequirks a.cke_colorauto
+{
+        width: 99.9%;
+}
+ No newline at end of file