From: <com...@fc...> - 2009-05-29 12:54:27
|
Author: tobiasz.cudnik Date: 2009-05-29 14:54:24 +0200 (Fri, 29 May 2009) New Revision: 3567 Modified: CKEditor/branches/features/kama/_source/skins/kama/mainui.css CKEditor/branches/features/kama/_source/skins/kama/skin.js CKEditor/branches/features/kama/_source/skins/kama/toolbar.css Log: * Fixed elementpath space in FF3 * Fixed extra toolbar spaces in IE6 Modified: CKEditor/branches/features/kama/_source/skins/kama/mainui.css =================================================================== --- CKEditor/branches/features/kama/_source/skins/kama/mainui.css 2009-05-29 12:33:20 UTC (rev 3566) +++ CKEditor/branches/features/kama/_source/skins/kama/mainui.css 2009-05-29 12:54:24 UTC (rev 3567) @@ -51,7 +51,7 @@ margin-right: -10px; } -.cke_skin_kama .cke_browser_opera .cke_editor +.cke_skin_kama .cke_browser_opera .cke_editor.cke_skin_kama .cke_resizer { display: table; } @@ -85,7 +85,7 @@ { width: 12px; height: 12px; - margin-top: 12px; + margin-top: 9px; display: block; float: right; background-image: url(images/resizer.gif); Modified: CKEditor/branches/features/kama/_source/skins/kama/skin.js =================================================================== --- CKEditor/branches/features/kama/_source/skins/kama/skin.js 2009-05-29 12:33:20 UTC (rev 3566) +++ CKEditor/branches/features/kama/_source/skins/kama/skin.js 2009-05-29 12:54:24 UTC (rev 3567) @@ -182,21 +182,6 @@ // Apply UI color if specified in config. if ( editor.config.uiColor ) editor.setUiColor( editor.config.uiColor ); - - // Fix editor width - editor.on( 'mode', function( event ) - { - if ( !CKEDITOR.env.ie || CKEDITOR.env.version >= 8 || CKEDITOR.env.quirks ) - return; - if ( editor.mode == 'wysiwyg' ) - editor.container.getElementsByTag( 'iframe' ).getItem(0).setStyle( 'width', '99%' ); - else if ( editor.mode == 'source' ) - { - var textarea = editor.container.getElementsByTag( 'textarea' ).getItem(0), - width = parseInt( textarea.getStyle( 'width' ) ); - textarea.setStyle( 'width' , (width - 10) + 'px' ); - } - }); } }; })() ); Modified: CKEditor/branches/features/kama/_source/skins/kama/toolbar.css =================================================================== --- CKEditor/branches/features/kama/_source/skins/kama/toolbar.css 2009-05-29 12:33:20 UTC (rev 3566) +++ CKEditor/branches/features/kama/_source/skins/kama/toolbar.css 2009-05-29 12:54:24 UTC (rev 3567) @@ -69,6 +69,8 @@ .cke_skin_kama .cke_break { + /*height: 0;*/ + font-size: 0; clear:left; } @@ -95,6 +97,29 @@ padding: 2px; } +/* Fix for extra spaces in IE6 */ +.cke_skin_kama .cke_browser_ie6 .cke_toolgroup +{ + margin-left: 0; +} + +.cke_skin_kama .cke_browser_ie6 .cke_toolbar +{ + margin-right: -2px; + margin-left: -1px; +} + +.cke_skin_kama .cke_browser_ie6 .cke_rcombo +{ + margin-left: 0; +} + +.cke_skin_kama .cke_browser_ie6 .cke_toolbox +{ + padding-left: 7px; +} +/* END Fix for extra spaces in IE6 */ + .cke_skin_kama .cke_button a, .cke_skin_kama .cke_button a.cke_off { |