vanilla ckeditor-3.6.3

[ckeditor.git] / _source / skins / kama / toolbar.css

diff --git a/_source/skins/kama/toolbar.css b/_source/skins/kama/toolbar.css
index ad2dccf..fa30249 100644 (file)
--- a/_source/skins/kama/toolbar.css
+++ b/_source/skins/kama/toolbar.css
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -79,14 +79,15 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        background-position: 4px -1408px; /* +2px +3px */\r
 }\r
 \r
-.cke_skin_kama .cke_toolbar\r
-{\r
-       display: inline;\r
-}\r
-\r
 .cke_skin_kama .cke_separator\r
 {\r
-       display: none;\r
+       display: inline-block;\r
+       border-left: solid 1px #D3D3D3;\r
+       margin: 3px 2px 0;\r
+       height: 16px;\r
+\r
+       /* These are for IE < 8, but it's ok for the others */\r
+       vertical-align: top;\r
 }\r
 \r
 .cke_skin_kama .cke_break\r
@@ -128,12 +129,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        margin-left: 6px;\r
 }\r
 \r
-.cke_skin_kama .cke_toolgroup\r
-{\r
-       display: block;\r
-       height: 22px;\r
-}\r
-\r
 .cke_skin_kama .cke_button a,\r
 .cke_skin_kama .cke_button a:hover,\r
 .cke_skin_kama .cke_button a:focus,\r
@@ -197,7 +192,8 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);\r
 }\r
 .cke_skin_kama .cke_browser_ie6 .cke_button a.cke_disabled *,\r
-.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *\r
+.cke_skin_kama .cke_browser_ie6 a:hover.cke_button .cke_disabled *,\r
+.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *\r
 {\r
        filter: alpha(opacity=30);\r
 }\r
@@ -252,7 +248,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        width: 16px;\r
        height: 16px;\r
        display: inline-block;\r
-       float: left;\r
        cursor: default;\r
 }\r
 \r
@@ -270,15 +265,13 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');\r
 }\r
 .cke_skin_kama .cke_browser_ie6 .cke_button .cke_icon,\r
-.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon\r
+.cke_skin_kama .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,\r
+.cke_skin_kama .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,\r
+.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon\r
 {\r
        filter: ;\r
 }\r
 \r
-.cke_skin_kama .cke_rtl .cke_button .cke_icon\r
-{\r
-       float: right;\r
-}\r
 \r
 .cke_skin_kama .cke_button .cke_label\r
 {\r
@@ -287,14 +280,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        padding-left: 3px;\r
        line-height: 18px;\r
        vertical-align: middle;\r
-       float: left;\r
-}\r
-\r
-.cke_skin_kama .cke_rtl .cke_button .cke_label\r
-{\r
-       padding-left: 0;\r
-       padding-right: 3px;\r
-       float: right;\r
 }\r
 \r
 .cke_skin_kama .cke_hc .cke_button .cke_label\r
@@ -326,7 +311,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        background-image: url(images/sprites.png);\r
        _background-image: url(images/sprites_ie6.png);\r
        background-repeat: no-repeat;\r
-       float: left;\r
        cursor: default;\r
 }\r
 \r
@@ -340,12 +324,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        filter: ;\r
 }\r
 \r
-.cke_skin_kama .cke_rtl .cke_button .cke_buttonarrow\r
-{\r
-       background-position: 0 -1469px; /* (0, -5) */\r
-       float: right;\r
-}\r
-\r
 /*** Firefox 2 ***/\r
 \r
 .cke_skin_kama .cke_browser_gecko .cke_toolbar,\r
@@ -370,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,\r
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_icon,\r
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_button .cke_buttonarrow,\r
+.cke_skin_kama .cke_browser_gecko .cke_rtl .cke_separator,\r
 .cke_skin_kama .cke_browser_gecko .cke_rtl .cke_toolbar_start\r
 {\r
        float: right;\r
@@ -387,18 +366,6 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
        float: right;\r
 }\r
 \r
-/*** IE ***/\r
-\r
-/* The biggest problem with IE is the RTL support (and float:right). It's\r
-   totally broken, and quite delicate. IE8 fixed these issues. */\r
-\r
-.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_icon,\r
-.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_label,\r
-.cke_skin_kama .cke_browser_ie .cke_rtl .cke_button .cke_buttonarrow\r
-{\r
-       float: none;\r
-}\r
-\r
 /*** WebKit ***/\r
 \r
 /* We have originally used display:inline-block+float for cke_toolbar and it\r
@@ -417,17 +384,9 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 \r
 /*** Mixed Fixes ***/\r
 \r
-.cke_skin_kama .cke_browser_ie8 .cke_button .cke_label,\r
-.cke_skin_kama .cke_browser_opera .cke_button .cke_label,\r
-.cke_skin_kama .cke_browser_webkit .cke_button .cke_label\r
-{\r
-       line-height: 20px;\r
-}\r
-\r
-.cke_skin_kama .cke_browser_opera.cke_browser_quirks .cke_button .cke_label,\r
-.cke_skin_kama .cke_browser_iequirks .cke_button .cke_label\r
+.cke_skin_kama .cke_browser_ie .cke_button .cke_label\r
 {\r
-       line-height: 17px;\r
+       line-height: 16px;\r
 }\r
 \r
 /* Fix cursor shape consistency on toolbar combos (#4031) */\r