X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fkama%2Ftoolbar.css;h=a0f9d163801ab57001b4302308dede8d0ad9df87;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hp=3ce80a9c90e97834141fc83eb0d29c6ba6895b4f;hpb=8761695d9b70afe75905deaac88f78c1f8aeb32d;p=ckeditor.git

diff --git a/_source/skins/kama/toolbar.css b/_source/skins/kama/toolbar.css
index 3ce80a9..a0f9d16 100644
--- a/_source/skins/kama/toolbar.css
+++ b/_source/skins/kama/toolbar.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -22,12 +22,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 .cke_skin_kama .cke_toolbox
 {
 	clear: both;
-	padding: 5px 3px 5px 6px;
-}
-
-.cke_skin_kama .cke_rtl .cke_toolbox
-{
-	padding: 5px 6px 5px 3px;
 }
 
 .cke_skin_kama a.cke_toolbox_collapser,
@@ -42,7 +36,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	height: 11px;
 	float: right;
 	border: 1px outset #D3D3D3;
-	margin: 11px 4px 2px;
+	margin: 11px 0 2px;
 	cursor: pointer;
 }
 
@@ -388,3 +382,26 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	vertical-align: middle;
 }
 /* END IE8 strict button valign correction */
+
+/* Fix cursor shape consistency on toolbar combos (#4031) */
+.cke_skin_kama .cke_browser_ie .cke_rcombo,
+.cke_skin_kama .cke_browser_ie .cke_rcombo *
+{
+	cursor: default;
+}
+
+.cke_skin_kama .cke_browser_ie7 .cke_toolbox
+{
+	margin-bottom: 2px;
+}
+
+.cke_shared .cke_skin_kama .cke_browser_ie7 .cke_toolbox
+{
+	margin-bottom: 0;
+}
+
+.cke_skin_kama .cke_browser_gecko .cke_toolbox
+{
+	/* Define the padding-bottom otherwise the collapser button will not be clicable in FF */
+	padding-bottom: 1px;
+}