Index: /CKEditor/trunk/CHANGES.html =================================================================== --- /CKEditor/trunk/CHANGES.html (revision 3926) +++ /CKEditor/trunk/CHANGES.html (revision 3927) @@ -149,4 +149,5 @@
  • #3972 : Fixed unable to remove a single empty list in document in Firefox with enterMode=BR.
  • #3973 : Fixed list creation error at the end of document.
    • +
  • #3793 : Combined images into sprites.

    • Index: /CKEditor/trunk/_source/skins/kama/dialog.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/dialog.css (revision 3926) +++ /CKEditor/trunk/_source/skins/kama/dialog.css (revision 3927) @@ -123,5 +123,5 @@ .cke_skin_kama a:visited.cke_dialog_tab { - background-image: url(sprites.png); + background-image: url(images/sprites.png); background-repeat: repeat-x; background-position: 0 -1323px; @@ -274,5 +274,5 @@ -webkit-border-radius: 5px; border-radius: 5px; - background: transparent url(sprites.png) repeat-x scroll 0 -1069px; + background: transparent url(images/sprites.png) repeat-x scroll 0 -1069px; _background: none; padding: 5px 0; @@ -330,5 +330,5 @@ .cke_skin_kama a.cke_dialog_ui_button_ok span { - background: transparent url(sprites.png) no-repeat scroll right -1219px; + background: transparent url(images/sprites.png) no-repeat scroll right -1219px; } @@ -352,5 +352,5 @@ .cke_skin_kama a.cke_dialog_ui_button_cancel span { - background: transparent url(sprites.png) no-repeat scroll right -1245px; + background: transparent url(images/sprites.png) no-repeat scroll right -1245px; } @@ -446,5 +446,5 @@ .cke_skin_kama .cke_dialog_close_button { - background-image: url(sprites.png); + background-image: url(images/sprites.png); background-repeat: no-repeat; background-position: 0 -1022px; @@ -458,5 +458,4 @@ /* IE 6 */ _background-image: url(images/sprites_ie6.png); - _background-position: 0 -713px; } Index: /CKEditor/trunk/_source/skins/kama/mainui.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/mainui.css (revision 3926) +++ /CKEditor/trunk/_source/skins/kama/mainui.css (revision 3927) @@ -26,5 +26,5 @@ border-radius: 5px; background-color: #d3d3d3; - background-image: url(sprites.png); + background-image: url(images/sprites.png); background-repeat: repeat-x; background-position: 0 -1950px; @@ -106,5 +106,9 @@ display: block; float: right; - background-image: url(images/resizer.gif); + /* resizer.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0 -1428px; + background-repeat: no-repeat; cursor: se-resize; } @@ -113,5 +117,6 @@ { cursor: sw-resize; - background-image: url(images/resizer_rtl.gif); + /* resizer_rtl.gif*/ + background-position: 0 -1455px; float: left; } Index: /CKEditor/trunk/_source/skins/kama/menu.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/menu.css (revision 3926) +++ /CKEditor/trunk/_source/skins/kama/menu.css (revision 3927) @@ -141,5 +141,8 @@ .cke_skin_kama .cke_menuarrow { - background-image: url(images/arrowright.gif); + /* arrowright.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0 -1411px; background-repeat: no-repeat; height: 5px; @@ -155,11 +158,22 @@ margin-right: 0; margin-left: 2px; - background-image: url(images/arrowleft.gif); + /* arrowleft.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0px -1390px; + background-repeat: no-repeat; } /* #3766 In the context menu, long labels with second level menu get wrapped */ -.cke_browser_ie .cke_skin_kama .cke_menuarrow +.cke_browser_ie.cke_ltr .cke_skin_kama .cke_menuarrow { position: absolute; - right: 0; + right: 2px; } + +.cke_browser_ie.cke_rtl .cke_skin_kama .cke_menuarrow +{ + position: absolute; + left: 2px; +} +/* END #3766 */ Index: /CKEditor/trunk/_source/skins/kama/richcombo.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/richcombo.css (revision 3926) +++ /CKEditor/trunk/_source/skins/kama/richcombo.css (revision 3927) @@ -39,5 +39,6 @@ -webkit-border-radius: 5px; border-radius: 5px; - background-image: url(sprites.png); + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-repeat: repeat-x; background-position: 0 -100px; @@ -121,5 +122,6 @@ .cke_skin_kama .cke_rcombo .cke_openbutton { - background-image: url(sprites.png); + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-position: 0 -68px; background-repeat: no-repeat; Index: /CKEditor/trunk/_source/skins/kama/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/toolbar.css (revision 3926) +++ /CKEditor/trunk/_source/skins/kama/toolbar.css (revision 3927) @@ -28,7 +28,9 @@ .cke_skin_kama a:hover.cke_toolbox_collapser { - background-image: url(images/arrowtop.gif); + /* arrowtop.gif */ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 3px -1366px; /* +3px +4px */ background-repeat: no-repeat; - background-position: center center; width: 11px; height: 11px; @@ -48,5 +50,9 @@ .cke_skin_kama a:hover.cke_toolbox_collapser_min { - background-image: url(images/arrowleft.gif); + /* arrowleft.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 4px -1387px; /* +4px +3px */ + background-repeat: no-repeat; margin: 2px 4px; } @@ -55,5 +61,6 @@ .cke_skin_kama .cke_rtl a:hover.cke_toolbox_collapser_min { - background-image: url(images/arrowright.gif); + /* arrowright.gif*/ + background-position: 4px -1408px; /* +2px +3px */ } @@ -89,5 +96,6 @@ -webkit-border-radius: 5px; border-radius: 5px; - background-image: url(sprites.png); + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-repeat: repeat-x; background-position: 0 -500px; @@ -261,6 +269,7 @@ height: 17px; width: 8px; - background-position: right center; - background-image: url(images/arrowdown.gif); + background-position: 2px -1469px; /* (+2, -5) */ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-repeat: no-repeat; float: left; @@ -269,5 +278,5 @@ .cke_skin_kama .cke_rtl .cke_button .cke_buttonarrow { - background-position: left center; + background-position: 0 -1469px; /* (0, -5) */ float: right; } Index: /CKEditor/trunk/_source/skins/office2003/dialog.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/dialog.css (revision 3926) +++ /CKEditor/trunk/_source/skins/office2003/dialog.css (revision 3927) @@ -158,4 +158,5 @@ { background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-position: 0 -678px; background-repeat: repeat-x; @@ -361,4 +362,5 @@ { background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-position: 0 -678px; background-repeat: repeat-x; @@ -449,5 +451,6 @@ { left: 10px; - _left: 22px; + _left: 16px; + _top: 6px; } Index: /CKEditor/trunk/_source/skins/office2003/mainui.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/mainui.css (revision 3926) +++ /CKEditor/trunk/_source/skins/office2003/mainui.css (revision 3927) @@ -67,8 +67,12 @@ width: 12px; height: 12px; - margin-top: 12px; + margin-top: 16px; display: block; float: right; - background-image: url(images/resizer.gif); + /* resizer.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0 -1088px; + background-repeat: no-repeat; cursor: se-resize; } @@ -82,5 +86,6 @@ { cursor: sw-resize; - background-image: url(images/resizer_rtl.gif); + /* resizer_rtl.gif*/ + background-position: 0 -1115px; float: left; } Index: /CKEditor/trunk/_source/skins/office2003/menu.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/menu.css (revision 3926) +++ /CKEditor/trunk/_source/skins/office2003/menu.css (revision 3927) @@ -100,6 +100,5 @@ } -/* Never applied */ -/*.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_label +.cke_rtl .cke_skin_office2003 .cke_menuitem .cke_label { padding-right: 0; @@ -107,5 +106,5 @@ padding-left: 3px; margin-right: 28px; -}*/ +} .cke_skin_office2003 .cke_menuitem a.cke_disabled .cke_label @@ -141,5 +140,8 @@ .cke_skin_office2003 .cke_menuarrow { - background-image: url(images/arrowright.gif); + /* arrowright.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0 -1071px; background-repeat: no-repeat; height: 5px; @@ -150,17 +152,24 @@ } -/* Never applied */ -/*.cke_rtl .cke_skin_office2003 .cke_menuarrow +.cke_rtl .cke_skin_office2003 .cke_menuarrow { float: left; margin-right: 0; margin-left: 2px; - background-image: url(images/arrowleft.gif); -}*/ + /* arrowleft.gif*/ + background-position: 0 -1050px; +} /* #3766 In the context menu, long labels with second level menu get wrapped */ -.cke_browser_ie .cke_skin_office2003 .cke_menuarrow +.cke_browser_ie.cke_ltr .cke_skin_office2003 .cke_menuarrow { position: absolute; - right: 0; + right: 2px; } + +.cke_browser_ie.cke_rtl .cke_skin_office2003 .cke_menuarrow +{ + position: absolute; + left: 2px; +} +/* END #3766 */ Index: /CKEditor/trunk/_source/skins/office2003/richcombo.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/richcombo.css (revision 3926) +++ /CKEditor/trunk/_source/skins/office2003/richcombo.css (revision 3927) @@ -72,4 +72,5 @@ _background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); _background-position: 0 -962px; _background-repeat: repeat-x; @@ -139,6 +140,7 @@ display: inline-block; - background-position: center center; - background-image: url(images/arrowdown.gif); + background-position: 5px -1002px; + background-image: url(images/sprites.png); + background-image: url(images/sprites_ie6.png); background-repeat: no-repeat; Index: /CKEditor/trunk/_source/skins/office2003/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/toolbar.css (revision 3926) +++ /CKEditor/trunk/_source/skins/office2003/toolbar.css (revision 3927) @@ -15,7 +15,8 @@ .cke_skin_office2003 a:hover.cke_toolbox_collapser { - background-image: url(images/arrowtop.gif); + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 3px -1026px; /* +3px +4px */ background-repeat: no-repeat; - background-position: center center; width: 11px; height: 11px; @@ -35,5 +36,9 @@ .cke_skin_office2003 a:hover.cke_toolbox_collapser_min { - background-image: url(images/arrowleft.gif); + /* arrowleft.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 4px -1047px; /* +4px +3px */ + background-repeat: no-repeat; margin: 2px; } @@ -42,5 +47,6 @@ .cke_skin_office2003 .cke_rtl a:hover.cke_toolbox_collapser_min { - background-image: url(images/arrowright.gif); + /* arrowright.gif*/ + background-position: 4px -1068px; /* +2px +3px */ } @@ -178,12 +184,10 @@ .cke_skin_office2003 .cke_button a, +.cke_skin_office2003 .cke_button a:hover, +.cke_skin_office2003 .cke_button a:focus, +.cke_skin_office2003 .cke_button a:active, .cke_skin_office2003 .cke_button a.cke_off { border: solid 1px transparent; - filter: alpha(opacity=70); /* IE */ - opacity: 0.70; /* Safari, Opera and Mozilla */ - display: inline-block; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; border-radius: 3px; outline: none; @@ -199,4 +203,14 @@ _margin: 3px 1px 1px 1px; cursor: default; + display: inline-block; +} + +.cke_skin_office2003 .cke_button a, +.cke_skin_office2003 .cke_button a.cke_off +{ + filter: alpha(opacity=70); /* IE */ + opacity: 0.70; /* Safari, Opera and Mozilla */ + -moz-border-radius: 3px; + -webkit-border-radius: 3px; } @@ -333,6 +347,7 @@ height: 18px; width: 8px; - background-position: right center; - background-image: url(images/arrowdown.gif); + background-position: 2px -1004px; + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-repeat: no-repeat; } @@ -340,5 +355,5 @@ .cke_skin_office2003 .cke_rtl .cke_button .cke_buttonarrow { - background-position: left center; + background-position: 0 -1004px; } Index: /CKEditor/trunk/_source/skins/v2/dialog.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/dialog.css (revision 3926) +++ /CKEditor/trunk/_source/skins/v2/dialog.css (revision 3927) @@ -448,5 +448,6 @@ { left: 10px; - _left: 22px; + _left: 16px; + _top: 7px; } Index: /CKEditor/trunk/_source/skins/v2/mainui.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/mainui.css (revision 3926) +++ /CKEditor/trunk/_source/skins/v2/mainui.css (revision 3927) @@ -82,8 +82,12 @@ width: 12px; height: 12px; - margin-top: 12px; + margin-top: 16px; display: block; float: right; - background-image: url(images/resizer.gif); + /* resizer.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0 -801px; + background-repeat: no-repeat; cursor: se-resize; } @@ -92,5 +96,6 @@ { cursor: sw-resize; - background-image: url(images/resizer_rtl.gif); + /* resizer_rtl.gif*/ + background-position: 0 -828px; float: left; } Index: /CKEditor/trunk/_source/skins/v2/menu.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/menu.css (revision 3926) +++ /CKEditor/trunk/_source/skins/v2/menu.css (revision 3927) @@ -100,6 +100,5 @@ } -/* Never applied */ -/*.cke_rtl .cke_skin_v2 .cke_menuitem .cke_label +.cke_rtl .cke_skin_v2 .cke_menuitem .cke_label { padding-right: 0; @@ -107,5 +106,5 @@ padding-left: 3px; margin-right: 28px; -}*/ +} .cke_skin_v2 .cke_menuitem a.cke_disabled .cke_label @@ -128,5 +127,5 @@ { background-color: transparent; - color: inherit; + color: black; } @@ -143,5 +142,8 @@ .cke_skin_v2 .cke_menuarrow { - background-image: url(images/arrowright.gif); + /* arrowright.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 0 -784px; background-repeat: no-repeat; height: 5px; @@ -153,16 +155,24 @@ /* Never applied */ -/*.cke_rtl .cke_skin_v2 .cke_menuarrow +.cke_rtl .cke_skin_v2 .cke_menuarrow { float: left; margin-right: 0; margin-left: 2px; - background-image: url(images/arrowleft.gif); -}*/ + /* arrowleft.gif*/ + background-position: 0 -763px; +} /* #3766 In the context menu, long labels with second level menu get wrapped */ -.cke_browser_ie .cke_skin_v2 .cke_menuarrow +.cke_browser_ie.cke_ltr .cke_skin_v2 .cke_menuarrow { position: absolute; - right: 0; + right: 2px; } + +.cke_browser_ie.cke_rtl .cke_skin_v2 .cke_menuarrow +{ + position: absolute; + left: 2px; +} +/* END #3766 */ Index: /CKEditor/trunk/_source/skins/v2/richcombo.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/richcombo.css (revision 3926) +++ /CKEditor/trunk/_source/skins/v2/richcombo.css (revision 3927) @@ -136,6 +136,7 @@ display: inline-block; - background-position: center center; - background-image: url(images/arrowdown.gif); + background-position: 5px -715px; + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-repeat: no-repeat; Index: /CKEditor/trunk/_source/skins/v2/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/toolbar.css (revision 3926) +++ /CKEditor/trunk/_source/skins/v2/toolbar.css (revision 3927) @@ -15,7 +15,8 @@ .cke_skin_v2 a:hover.cke_toolbox_collapser { - background-image: url(images/arrowtop.gif); + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 3px -739px; /* +3px +4px */ background-repeat: no-repeat; - background-position: center center; width: 11px; height: 11px; @@ -35,5 +36,9 @@ .cke_skin_v2 a:hover.cke_toolbox_collapser_min { - background-image: url(images/arrowleft.gif); + /* arrowleft.gif*/ + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); + background-position: 4px -760px; /* +4px +3px */ + background-repeat: no-repeat; margin: 2px; } @@ -42,5 +47,6 @@ .cke_skin_v2 .cke_rtl a:hover.cke_toolbox_collapser_min { - background-image: url(images/arrowright.gif); + /* arrowright.gif*/ + background-position: 4px -781px; /* +2px +3px */ } @@ -165,13 +171,11 @@ .cke_skin_v2 .cke_button a, +.cke_skin_v2 .cke_button a:hover, +.cke_skin_v2 .cke_button a:focus, +.cke_skin_v2 .cke_button a:active, .cke_skin_v2 .cke_button a.cke_off { border: solid 1px #efefde; - background-color: #efefde; - filter: alpha(opacity=70); /* IE */ - opacity: 0.70; /* Safari, Opera and Mozilla */ - display: inline-block; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; + display: inline-block; border-radius: 3px; outline: none; @@ -184,4 +188,14 @@ } +.cke_skin_v2 .cke_button a, +.cke_skin_v2 .cke_button a.cke_off +{ + background-color: #efefde; + filter: alpha(opacity=70); /* IE */ + opacity: 0.70; /* Safari, Opera and Mozilla */ + -moz-border-radius: 3px; + -webkit-border-radius: 3px; +} + .cke_skin_v2 .cke_hc .cke_button a, .cke_skin_v2 .cke_hc .cke_button a.cke_off @@ -290,6 +304,7 @@ height: 17px; width: 8px; - background-position: right center; - background-image: url(images/arrowdown.gif); + background-position: 2px -717px; + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); background-repeat: no-repeat; } @@ -297,5 +312,7 @@ .cke_skin_v2 .cke_rtl .cke_button .cke_buttonarrow { - background-position: left center; + background-position: 0 -717px; + background-image: url(images/sprites.png); + _background-image: url(images/sprites_ie6.png); }