X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fv2%2Fmenu.css;h=82d5c679a9fa46d5755d86df6d282312ba545243;hb=9afde8772159bd3436f1f5b7862960307710ae5a;hp=a1a6d13dde5317e71c4a3f674d484d40fd508303;hpb=941b0a9ba4e673e292510d80a5a86806994b8ea6;p=ckeditor.git

diff --git a/_source/skins/v2/menu.css b/_source/skins/v2/menu.css
index a1a6d13..82d5c67 100644
--- a/_source/skins/v2/menu.css
+++ b/_source/skins/v2/menu.css
@@ -25,12 +25,11 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	background-color: #8f8f73;
 	display:block;
 }
-
-.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
+.cke_hc .cke_menuitem a:hover,
+.cke_hc .cke_menuitem a:focus,
+.cke_hc .cke_menuitem a:active
 {
-	background-color: transparent !important;
+	border: 2px solid;
 }
 
 .cke_skin_v2 .cke_menuitem .cke_icon
@@ -44,12 +43,46 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	float: left;
 }
 
+.cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon
+{
+	background-image: url(icons_rtl.png);
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_browser_ie .cke_skin_v2 .cke_menuitem .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie.cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_icon
+{
+	filter: ;
+}
+
 .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon
 {
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
 }
 
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_browser_ie .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie.cke_rtl .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_browser_ie6 .cke_skin_v2 .cke_menuitem .cke_disabled .cke_icon
+{
+	filter: ;
+}
+
 .cke_skin_v2 .cke_menuitem .cke_icon_wrapper
 {
 	background-color: #e3e3c7;
@@ -59,6 +92,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	float: left;
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
+	clear: both;
+}
+
+/* IE9 insists on border box model on this element.*/
+ .cke_browser_ie9 .cke_skin_v2 .cke_menuitem .cke_icon_wrapper
+{
+	width:24px;
+	height:24px;
 }
 
 .cke_rtl .cke_skin_v2 .cke_menuitem .cke_icon_wrapper
@@ -93,8 +134,17 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	height:19px;
 	margin-left: 24px;
 	background-color: #fff;
-	_overflow: hidden;
-	_width: 80px;
+}
+
+/* IE9 insists on border box model on this element.*/
+.cke_browser_ie9 .cke_skin_v2 .cke_menuitem .cke_label
+{
+	height:24px;
+}
+
+/* Set these after the document has been loaded and we know the dimensions*/
+.cke_skin_v2 .cke_frameLoaded .cke_menuitem .cke_label
+{
 	filter: alpha(opacity=70); /* IE */
 	opacity: 0.70; /* Safari, Opera and Mozilla */
 }
@@ -163,6 +213,22 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	background-position: 0 -763px;
 }
 
+.cke_skin_v2 .cke_menuarrow span
+{
+	display: none;
+}
+
+.cke_hc .cke_skin_v2 .cke_menuarrow
+{
+	width: auto;
+	margin-top: 0;
+}
+
+.cke_hc .cke_skin_v2 .cke_menuarrow span
+{
+	display: inline;
+}
+
 /* #3766 In the context menu, long labels with second level menu get wrapped */
 .cke_browser_ie.cke_ltr .cke_skin_v2 .cke_menuarrow
 {