X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fskins%2Fv2%2Ftoolbar.css;h=f6a95121374272f43e85cd4d0f188e2172a7373a;hb=8f6c203fdaa543c3bca40baea6ae4ddcdf1a77f5;hp=f2d0ff006518a80be88a62391b51304a3a049d8d;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91;p=ckeditor.git

diff --git a/_source/skins/v2/toolbar.css b/_source/skins/v2/toolbar.css
index f2d0ff0..f6a9512 100644
--- a/_source/skins/v2/toolbar.css
+++ b/_source/skins/v2/toolbar.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -11,6 +11,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	}
 }
 
+.cke_skin_v2 .cke_browser_webkit .cke_toolbox,
+.cke_skin_v2 .cke_browser_webkit .cke_toolbox > span
+{
+	white-space: normal;
+}
+
+.cke_skin_v2 .cke_toolbox
+{
+	clear: both;
+	/* Define the padding-bottom otherwise the collapser button will not be clickable #4932*/
+	padding-bottom: 1px;
+}
+
 .cke_skin_v2 a.cke_toolbox_collapser,
 .cke_skin_v2 a:hover.cke_toolbox_collapser
 {
@@ -26,6 +39,19 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	cursor: pointer;
 }
 
+.cke_skin_v2 a.cke_toolbox_collapser span
+{
+	display: none;
+}
+
+.cke_skin_v2 .cke_hc a.cke_toolbox_collapser span
+{
+	font-size: 10px;
+	font-weight: bold;
+	font-family: Arial;
+	display: inline;
+}
+
 .cke_skin_v2 .cke_rtl a.cke_toolbox_collapser,
 .cke_skin_v2 .cke_rtl a:hover.cke_toolbox_collapser
 {
@@ -90,7 +116,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	display: inline-block;
 	float: left;
 	border-left: solid 1px #999;
-	margin: 0 2px;
+	margin: 4px 2px;
 	height: 16px;
 }
 
@@ -127,7 +153,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	background-repeat: no-repeat;
 	margin: 4px 2px 0 2px;
 	width: 3px;
-	height: 16px;
+	height: 20px;
 	float: left;
 }
 
@@ -169,6 +195,14 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	#float: none;
 }
 
+/*#7181*/
+.cke_skin_v2 .cke_browser_ie9 .cke_rtl .cke_separator,
+.cke_skin_v2 .cke_browser_ie9 .cke_rtl .cke_toolbar_start,
+.cke_skin_v2 .cke_browser_ie9 .cke_rtl .cke_toolbar_end
+{
+	vertical-align:middle;
+}
+
 .cke_skin_v2 .cke_button a,
 .cke_skin_v2 .cke_button a:hover,
 .cke_skin_v2 .cke_button a:focus,
@@ -212,48 +246,49 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	opacity: 1; /* Safari, Opera and Mozilla */
 }
 
-.cke_skin_v2 .cke_hc .cke_button a.cke_on
+.cke_skin_v2 .cke_button a.cke_disabled *
 {
-	padding: 0 2px !important;
-	border-width: 3px;
+	filter: alpha(opacity=30); /* IE */
+	opacity: 0.3; /* Safari, Opera and Mozilla */
 }
 
-.cke_skin_v2 .cke_button a.cke_disabled,
-.cke_skin_v2 .cke_browser_ie a:hover.cke_button .cke_disabled
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_v2 .cke_browser_ie .cke_button a.cke_disabled *,
+.cke_skin_v2 .cke_browser_ie a:hover.cke_button .cke_disabled *
 {
-	border: solid 1px #efefde;
-	background-color: #efefde;
-	filter: alpha(opacity=30); /* IE */
-	opacity : 0.3; /* Safari, Opera and Mozilla */
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button a.cke_disabled *,
+.cke_skin_v2 .cke_browser_ie .cke_rtl a:hover.cke_button .cke_disabled *
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale'), alpha(opacity=30);
+}
+.cke_skin_v2 .cke_browser_ie6 .cke_button a.cke_disabled *,
+.cke_skin_v2 .cke_browser_ie6 a:hover.cke_button .cke_disabled *,
+.cke_skin_v2 .cke_browser_ie .cke_button.cke_noalphafix a.cke_disabled *
+{
+	filter: alpha(opacity=30);
 }
 
-.cke_skin_v2 .cke_hc .cke_button a.cke_disabled,
-.cke_skin_v2 .cke_browser_ie.cke_hc a:hover.cke_button .cke_disabled
+.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);
 	opacity: 0.6;
 }
 
-.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;
 	border-width: 3px;
@@ -268,6 +303,29 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	width: 16px;
 	height: 16px;
 	display: inline-block;
+	cursor: default;
+}
+
+.cke_skin_v2 .cke_rtl .cke_button .cke_icon
+{
+	background-image: url(icons_rtl.png);
+}
+
+/* IE with zoom != 100% will distort the icons otherwise #4821 */
+.cke_skin_v2 .cke_browser_ie .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button .cke_icon
+{
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale');
+}
+.cke_skin_v2 .cke_browser_ie6 .cke_button .cke_icon,
+.cke_skin_v2 .cke_browser_ie6 .cke_rtl .cke_button .cke_icon,
+.cke_skin_v2 .cke_browser_ie .cke_button.cke_noalphafix .cke_icon,
+.cke_skin_v2 .cke_browser_ie .cke_rtl .cke_button.cke_noalphafix .cke_icon
+{
+	filter: ;
 }
 
 .cke_skin_v2 .cke_button .cke_label
@@ -275,7 +333,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	cursor: default;
 	display: none;
 	padding-left: 3px;
-	vertical-align: 3px;
+	vertical-align:middle;
 }
 
 .cke_skin_v2 .cke_hc .cke_button .cke_label
@@ -307,6 +365,7 @@ 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;
+	cursor: default;
 }
 
 .cke_skin_v2 .cke_rtl .cke_button .cke_buttonarrow
@@ -397,3 +456,10 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
 	/* revert previous */
 	vertical-align: baseline;
 }
+
+/* Fix cursor shape consistency on toolbar combos (#4031) */
+.cke_skin_v2 .cke_browser_ie .cke_rcombo,
+.cke_skin_v2 .cke_browser_ie .cke_rcombo *
+{
+	cursor: default;
+}