Index: /CKEditor/trunk/CHANGES.html =================================================================== --- /CKEditor/trunk/CHANGES.html (revision 5244) +++ /CKEditor/trunk/CHANGES.html (revision 5245) @@ -71,4 +71,5 @@
  • #4479 : Style combo doesn't reflect the selection until it's first opened.
  • #4717 : 'Unlink' and 'Outdent' command buttons should be disabled on editor startup.
    • +
  • #5119 : Disabled command buttons are not being properly marked when focused.

    • Index: /CKEditor/trunk/_source/skins/kama/menu.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/menu.css (revision 5244) +++ /CKEditor/trunk/_source/skins/kama/menu.css (revision 5245) @@ -32,18 +32,4 @@ { border: 2px solid; -} - -.cke_skin_kama .cke_menuitem a.cke_disabled:hover, -.cke_skin_kama .cke_menuitem a.cke_disabled:focus, -.cke_skin_kama .cke_menuitem a.cke_disabled:active -{ - background-color: transparent !important; -} - -.cke_hc .cke_menuitem a.cke_disabled:hover, -.cke_hc .cke_menuitem a.cke_disabled:focus, -.cke_hc .cke_menuitem a.cke_disabled:active -{ - border-width: 0px; } Index: /CKEditor/trunk/_source/skins/kama/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/kama/toolbar.css (revision 5244) +++ /CKEditor/trunk/_source/skins/kama/toolbar.css (revision 5245) @@ -174,6 +174,6 @@ } -.cke_skin_kama .cke_button a.cke_disabled, -.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled +.cke_skin_kama .cke_button a.cke_disabled *, +.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled * { filter: alpha(opacity=30); /* IE */ @@ -181,6 +181,6 @@ } -.cke_skin_kama .cke_hc .cke_button a.cke_disabled, -.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled +.cke_skin_kama .cke_hc .cke_button a.cke_disabled *, +.cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled * { filter: alpha(opacity=60); @@ -200,4 +200,11 @@ } +.cke_skin_kama .cke_button a:hover, +.cke_skin_kama .cke_button a:focus, +.cke_skin_kama .cke_button a:active /* IE */ +{ + background-color: #dff1ff; +} + .cke_skin_kama .cke_button a:hover.cke_on, .cke_skin_kama .cke_button a:focus.cke_on, @@ -207,17 +214,7 @@ } -.cke_skin_kama .cke_button a:hover.cke_off, -.cke_skin_kama .cke_button a:focus.cke_off, -.cke_skin_kama .cke_button a:active.cke_off /* IE */ -{ - background-color: #dff1ff; -} - -.cke_skin_kama .cke_hc .cke_button a:hover.cke_on, -.cke_skin_kama .cke_hc .cke_button a:focus.cke_on, -.cke_skin_kama .cke_hc .cke_button a:active.cke_on, /* IE */ -.cke_skin_kama .cke_hc .cke_button a:hover.cke_off, -.cke_skin_kama .cke_hc .cke_button a:focus.cke_off, -.cke_skin_kama .cke_hc .cke_button a:active.cke_off /* IE */ +.cke_skin_kama .cke_hc .cke_button a:hover, +.cke_skin_kama .cke_hc .cke_button a:focus, +.cke_skin_kama .cke_hc .cke_button a:active /* IE */ { padding: 0 2px !important; Index: /CKEditor/trunk/_source/skins/office2003/menu.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/menu.css (revision 5244) +++ /CKEditor/trunk/_source/skins/office2003/menu.css (revision 5245) @@ -32,18 +32,4 @@ { border: 2px solid; -} - -.cke_skin_office2003 .cke_menuitem a.cke_disabled:hover, -.cke_skin_office2003 .cke_menuitem a.cke_disabled:focus, -.cke_skin_office2003 .cke_menuitem a.cke_disabled:active -{ - background-color: transparent !important; -} - -.cke_hc .cke_menuitem a.cke_disabled:hover, -.cke_hc .cke_menuitem a.cke_disabled:focus, -.cke_hc .cke_menuitem a.cke_disabled:active -{ - border-width: 0px; } Index: /CKEditor/trunk/_source/skins/office2003/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/office2003/toolbar.css (revision 5244) +++ /CKEditor/trunk/_source/skins/office2003/toolbar.css (revision 5245) @@ -260,5 +260,7 @@ } -.cke_skin_office2003 .cke_hc .cke_button a.cke_on +.cke_skin_office2003 .cke_hc .cke_button a:hover, +.cke_skin_office2003 .cke_hc .cke_button a:focus, +.cke_skin_office2003 .cke_hc .cke_button a:active /* IE */ { padding: 0 2px !important; @@ -266,20 +268,13 @@ } -.cke_skin_office2003 .cke_button a.cke_disabled, -.cke_skin_office2003 .cke_button a:hover.cke_disabled, -.cke_skin_office2003 .cke_button a:focus.cke_disabled, -.cke_skin_office2003 .cke_button a:active.cke_disabled -{ - border: solid 1px transparent; +.cke_skin_office2003 .cke_button a.cke_disabled *, +.cke_skin_office2003 .cke_browser_ie a:hover.cke_button .cke_disabled * +{ filter: alpha(opacity=30); /* IE */ - opacity : 0.3; /* Safari, Opera and Mozilla */ - vertical-align: top; - - _border: none; - _margin: 3px 1px 1px 1px; -} - -.cke_skin_office2003 .cke_hc .cke_button a.cke_disabled, -.cke_skin_office2003 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled + opacity: 0.3; /* Safari, Opera and Mozilla */ +} + +.cke_skin_office2003 .cke_hc .cke_button a.cke_disabled *, +.cke_skin_office2003 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled * { filter: alpha(opacity=60); @@ -287,10 +282,7 @@ } -.cke_skin_office2003 .cke_button a:hover.cke_on, -.cke_skin_office2003 .cke_button a:focus.cke_on, -.cke_skin_office2003 .cke_button a:active.cke_on, /* IE */ -.cke_skin_office2003 .cke_button a:hover.cke_off, -.cke_skin_office2003 .cke_button a:focus.cke_off, -.cke_skin_office2003 .cke_button a:active.cke_off /* IE */ +.cke_skin_office2003 .cke_button a:hover, +.cke_skin_office2003 .cke_button a:focus, +.cke_skin_office2003 .cke_button a:active /* IE */ { border: solid 1px #316ac5; @@ -302,15 +294,4 @@ _margin: 2px 0 0 0; padding: 2px 4px; -} - -.cke_skin_office2003 .cke_hc .cke_button a:hover.cke_on, -.cke_skin_office2003 .cke_hc .cke_button a:focus.cke_on, -.cke_skin_office2003 .cke_hc .cke_button a:active.cke_on, /* IE */ -.cke_skin_office2003 .cke_hc .cke_button a:hover.cke_off, -.cke_skin_office2003 .cke_hc .cke_button a:focus.cke_off, -.cke_skin_office2003 .cke_hc .cke_button a:active.cke_off /* IE */ -{ - padding: 0 2px !important; - border-width: 3px; } Index: /CKEditor/trunk/_source/skins/v2/menu.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/menu.css (revision 5244) +++ /CKEditor/trunk/_source/skins/v2/menu.css (revision 5245) @@ -32,19 +32,4 @@ border: 2px solid; } - -.cke_skin_v2 .cke_menuitem a.cke_disabled:hover, -.cke_skin_v2 .cke_menuitem a.cke_disabled:focus, -.cke_skin_v2 .cke_menuitem a.cke_disabled:active -{ - background-color: transparent !important; -} - -.cke_hc .cke_menuitem a.cke_disabled:hover, -.cke_hc .cke_menuitem a.cke_disabled:focus, -.cke_hc .cke_menuitem a.cke_disabled:active -{ - border-width: 0px; -} - .cke_skin_v2 .cke_menuitem .cke_icon Index: /CKEditor/trunk/_source/skins/v2/toolbar.css =================================================================== --- /CKEditor/trunk/_source/skins/v2/toolbar.css (revision 5244) +++ /CKEditor/trunk/_source/skins/v2/toolbar.css (revision 5245) @@ -239,21 +239,13 @@ } -.cke_skin_v2 .cke_hc .cke_button a.cke_on -{ - padding: 0 2px !important; - border-width: 3px; -} - -.cke_skin_v2 .cke_button a.cke_disabled, -.cke_skin_v2 .cke_browser_ie a:hover.cke_button .cke_disabled -{ - border: solid 1px #efefde; - background-color: #efefde; +.cke_skin_v2 .cke_button a.cke_disabled *, +.cke_skin_v2 .cke_browser_ie a:hover.cke_button .cke_disabled * +{ filter: alpha(opacity=30); /* IE */ - opacity : 0.3; /* Safari, Opera and Mozilla */ -} - -.cke_skin_v2 .cke_hc .cke_button a.cke_disabled, -.cke_skin_v2 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled + opacity: 0.3; /* Safari, Opera and Mozilla */ +} + +.cke_skin_v2 .cke_hc .cke_button a.cke_disabled *, +.cke_skin_v2 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled * { filter: alpha(opacity=60); @@ -261,24 +253,16 @@ } -.cke_skin_v2 .cke_button a:hover.cke_on, -.cke_skin_v2 .cke_button a:focus.cke_on, -.cke_skin_v2 .cke_button a:active.cke_on, /* IE */ -.cke_skin_v2 .cke_button a:hover.cke_off, -.cke_skin_v2 .cke_button a:focus.cke_off, -.cke_skin_v2 .cke_button a:active.cke_off /* IE */ +.cke_skin_v2 .cke_button a:hover, +.cke_skin_v2 .cke_button a:focus, +.cke_skin_v2 .cke_button a:active /* IE */ { border: solid 1px #316ac5; background-color: #dff1ff; - filter: alpha(opacity=100); /* IE */ - opacity: 1; /* Safari, Opera and Mozilla */ padding: 2px 4px; } -.cke_skin_v2 .cke_hc .cke_button a:hover.cke_on, -.cke_skin_v2 .cke_hc .cke_button a:focus.cke_on, -.cke_skin_v2 .cke_hc .cke_button a:active.cke_on, /* IE */ -.cke_skin_v2 .cke_hc .cke_button a:hover.cke_off, -.cke_skin_v2 .cke_hc .cke_button a:focus.cke_off, -.cke_skin_v2 .cke_hc .cke_button a:active.cke_off /* IE */ +.cke_skin_v2 .cke_hc .cke_button a:hover, +.cke_skin_v2 .cke_hc .cke_button a:focus, +.cke_skin_v2 .cke_hc .cke_button a:active /* IE */ { padding: 0 2px !important;