Ticket #7332: 7332.patch
File 7332.patch, 4.3 KB (added by , 13 years ago) |
---|
-
_source/plugins/colorbutton/plugin.js
159 159 '<td>' + 160 160 '<span class="cke_colorbox" id="', colorBoxId, '"></span>' + 161 161 '</td>' + 162 '<td colspan=7align=center>',162 '<td align=center>', 163 163 lang.auto, 164 164 '</td>' + 165 165 '</tr>' + 166 166 '</table>' + 167 167 '</a>' + 168 169 ( CKEDITOR.env.ie && CKEDITOR.env.quirks ? '<div style="width: 100%; padding: 0px; margin: 0px;">' : '' ), 168 170 '<table role="presentation" cellspacing=0 cellpadding=0 width="100%">' ); 169 171 170 172 // Render the color boxes. … … 180 182 // The data can be only a color code (without #) or colorName + color code 181 183 // If only a color code is provided, then the colorName is the color with the hash 182 184 // Convert the color from RGB to RRGGBB for better compatibility with IE and <font>. See #5676 183 if ( !parts[1])185 if ( !parts[1] ) 184 186 colorName = '#' + colorName.replace( /^(.)(.)(.)$/, '$1$1$2$2$3$3' ); 185 187 186 188 var colorLabel = editor.lang.colors[ colorCode ] || colorCode; … … 214 216 } 215 217 216 218 output.push( '</tr></table>' ); 219 CKEDITOR.env.ie && CKEDITOR.env.quirks && output.push( '</div>' ); 217 220 218 221 return output.join( '' ); 219 222 } -
_source/skins/kama/panel.css
149 149 height: 135px; 150 150 } 151 151 152 /* #7332 */ 153 .cke_colorblock, .cke_colorblock * 154 { 155 font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif; 156 font-size: 11px; 157 } 152 158 .cke_colorblock 153 159 { 154 160 padding: 3px; 155 font-size: 11px;156 font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;157 161 } 158 162 159 163 .cke_colorblock, … … 215 219 border: #316ac5 1px solid; 216 220 background-color: #dff1ff; 217 221 } 222 223 /* Quirks fixes #7332 */ 224 .cke_browser_iequirks span.cke_colorbox 225 { 226 padding-left: 10px; 227 margin-right: 1px; 228 } 229 .cke_browser_iequirks.cke_rtl span.cke_colorbox 230 { 231 padding-left: 0px; 232 padding-right: 10px; 233 } 234 .cke_browser_iequirks a.cke_colorauto 235 { 236 width: 99.9%; 237 } 238 No newline at end of file -
_source/skins/office2003/panel.css
144 144 height: 135px; 145 145 } 146 146 147 .cke_colorblock, .cke_colorblock * 148 { 149 font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif; 150 font-size: 11px; 151 } 147 152 .cke_colorblock 148 153 { 149 154 padding: 3px; 150 font-size: 11px;151 font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;152 155 } 153 156 154 157 .cke_colorblock, … … 210 213 border: #316ac5 1px solid; 211 214 background-color: #dff1ff; 212 215 } 216 217 /* Quirks fixes #7332 */ 218 .cke_browser_iequirks span.cke_colorbox 219 { 220 padding-left: 10px; 221 margin-right: 1px; 222 } 223 .cke_browser_iequirks.cke_rtl span.cke_colorbox 224 { 225 padding-left: 0px; 226 padding-right: 10px; 227 } 228 .cke_browser_iequirks a.cke_colorauto 229 { 230 width: 99.9%; 231 } 232 No newline at end of file -
_source/skins/v2/panel.css
144 144 height: 135px; 145 145 } 146 146 147 /* #7332 */ 148 .cke_colorblock, .cke_colorblock * 149 { 150 font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif; 151 font-size: 11px; 152 } 147 153 .cke_colorblock 148 154 { 149 155 padding: 3px; 150 font-size: 11px;151 font-family: 'Microsoft Sans Serif', Tahoma, Arial, Verdana, Sans-Serif;152 156 } 153 157 154 158 .cke_colorblock, … … 210 214 border: #316ac5 1px solid; 211 215 background-color: #dff1ff; 212 216 } 217 218 /* Quirks fixes #7332 */ 219 .cke_browser_iequirks span.cke_colorbox 220 { 221 padding-left: 10px; 222 margin-right: 1px; 223 } 224 .cke_browser_iequirks.cke_rtl span.cke_colorbox 225 { 226 padding-left: 0px; 227 padding-right: 10px; 228 } 229 .cke_browser_iequirks a.cke_colorauto 230 { 231 width: 99.9%; 232 } 233 No newline at end of file