X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fkama%2Ftoolbar.css;h=6bc0e2fbe8e5e5d02cfd7477c25ecdf9022c614d;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=d369c2a969b2f9439c5f72c1c47166cb4d097f16;hpb=055b6b0792ce7dc53d47af606b367c04b927c2ab;p=ckeditor.git

diff --git a/_source/skins/kama/toolbar.css b/_source/skins/kama/toolbar.css
index d369c2a..6bc0e2f 100644
--- a/_source/skins/kama/toolbar.css
+++ b/_source/skins/kama/toolbar.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -79,14 +79,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	background-position: 4px -1408px; /* +2px +3px */
 }
 
-.cke_skin_kama .cke_toolbar
-{
-	display: inline;
-}
-
 .cke_skin_kama .cke_separator
 {
-	display: none;
+	display: inline-block;
+	border-left: solid 1px #D3D3D3;
+	margin: 3px 2px 0;
+	height: 16px;
+
+	/* These are for IE < 8, but it's ok for the others */
+	vertical-align: top;
 }
 
 .cke_skin_kama .cke_break
@@ -128,12 +129,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	margin-left: 6px;
 }
 
-.cke_skin_kama .cke_toolgroup
-{
-	display: block;
-	height: 22px;
-}
-
 .cke_skin_kama .cke_button a,
 .cke_skin_kama .cke_button a:hover,
 .cke_skin_kama .cke_button a:focus,
@@ -179,13 +174,30 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	border-width: 3px;
 }
 
-.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 *
 {
 	filter: alpha(opacity=30); /* IE */
 	opacity: 0.3; /* Safari, Opera and Mozilla */
 }
 
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_kama .cke_browser_ie .cke_button a.cke_disabled *,
+.cke_skin_kama .cke_browser_ie a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,
+.cke_skin_kama .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,
+.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *,
+.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *
+{
+	filter: alpha(opacity=30);
+}
+
 .cke_skin_kama .cke_hc .cke_button a.cke_disabled *,
 .cke_skin_kama .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled *
 {
@@ -236,15 +248,31 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	width: 16px;
 	height: 16px;
 	display: inline-block;
-	float: left;
 	cursor: default;
 }
 
 .cke_skin_kama .cke_rtl .cke_button .cke_icon
 {
-	float: right;
+	background-image: url(icons_rtl.png);
+}
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_kama .cke_browser_ie .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,
+.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,
+.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon
+{
+	filter: ;
 }
 
+
 .cke_skin_kama .cke_button .cke_label
 {
 	cursor: default;
@@ -252,14 +280,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	padding-left: 3px;
 	line-height: 18px;
 	vertical-align: middle;
-	float: left;
-}
-
-.cke_skin_kama .cke_rtl .cke_button .cke_label
-{
-	padding-left: 0;
-	padding-right: 3px;
-	float: right;
 }
 
 .cke_skin_kama .cke_hc .cke_button .cke_label
@@ -291,14 +311,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	background-image: url(images/sprites.png);
 	_background-image: url(images/sprites_ie6.png);
 	background-repeat: no-repeat;
-	float: left;
 	cursor: default;
 }
 
-.cke_skin_kama .cke_rtl .cke_button .cke_buttonarrow
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_kama .cke_browser_ie .cke_button .cke_buttonarrow
 {
-	background-position: 0 -1469px; /* (0, -5) */
-	float: right;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_kama .cke_browser_ie6 .cke_button .cke_buttonarrow
+{
+	filter: ;
 }
 
 /*** Firefox 2 ***/
@@ -325,6 +348,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 .cke_skin_kama .cke_browser_gecko .cke_rtl.cke_button a.cke_off,
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_icon,
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,
+.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_separator,
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar_start
 {
 	float: right;
@@ -337,23 +361,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 }
 
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_label,
-.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_break
+.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_break,
+.cke_skin_kama .cke_browser_ie8 .cke_rtl .cke_break,
+.cke_skin_kama .cke_browser_ie9plus .cke_rtl .cke_break
 {
 	float: right;
 }
 
-/*** IE ***/
-
-/* The biggest problem with IE is the RTL support (and float:right). It's
-   totally broken, and quite delicate. IE8 fixed these issues. */
-
-.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon,
-.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_label,
-.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_buttonarrow
-{
-	float: none;
-}
-
 /*** WebKit ***/
 
 /* We have originally used display:inline-block+float for cke_toolbar and it
@@ -372,17 +386,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 
 /*** Mixed Fixes ***/
 
-.cke_skin_kama .cke_browser_ie8 .cke_button .cke_label,
-.cke_skin_kama .cke_browser_opera .cke_button .cke_label,
-.cke_skin_kama .cke_browser_webkit .cke_button .cke_label
-{
-	line-height: 20px;
-}
-
-.cke_skin_kama .cke_browser_opera.cke_browser_quirks .cke_button .cke_label,
-.cke_skin_kama .cke_browser_iequirks .cke_button .cke_label
+.cke_skin_kama .cke_browser_ie .cke_button .cke_label
 {
-	line-height: 17px;
+	line-height: 16px;
 }
 
 /* Fix cursor shape consistency on toolbar combos (#4031) */