Bug 606683 - Allow customization of toolbars in Composer and formatting toolbar in MailNews Composition - Switch from toolbar id to class patch v1.2 r=neil ui-r=stefanh
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 02 Mar 2011 23:07:55 +0000
changeset 7245 118029396d1bfcaec7bbfb533a6a699383f6092e
parent 7244 a4afd59a66b2d9d6ae44344c4f3d1c30cdd86ca3
child 7246 c2ea4943b5321e08ca47c61c37c1eae3000b37c4
push idunknown
push userunknown
push dateunknown
reviewersneil, stefanh
bugs606683
Bug 606683 - Allow customization of toolbars in Composer and formatting toolbar in MailNews Composition - Switch from toolbar id to class patch v1.2 r=neil ui-r=stefanh
suite/themes/classic/editor/editorFormatToolbar.css
suite/themes/classic/mac/editor/editorFormatToolbar.css
suite/themes/modern/editor/editorFormatToolbar.css
--- a/suite/themes/classic/editor/editorFormatToolbar.css
+++ b/suite/themes/classic/editor/editorFormatToolbar.css
@@ -35,26 +35,23 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: formatting buttons ::::: */
 
-#FormatToolbar > toolbarbutton {
-  min-width: 32px;
-}
- 
 #FormatToolbar > toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
-#FormatToolbar > toolbarbutton {
+toolbarbutton.formatting-button {
   list-style-image: url("chrome://editor/skin/icons/btn2.gif");
+  min-width: 32px;
 }
 
 #DecreaseFontSizeButton {
   -moz-image-region: rect(64px 14px 80px 0px);
 }
 
 #DecreaseFontSizeButton:hover {
   -moz-image-region: rect(64px 28px 80px 14px);
@@ -545,50 +542,51 @@
 
 #HighlightColorButton[disabled="true"],
 #HighlightColorButton[disabled="true"]:hover,
 #HighlightColorButton[disabled="true"]:hover:active {
   -moz-image-region: rect(260px 64px 272px 48px);
 }
 
 
-#absolutePositionButton{
+#absolutePositionButton {
   -moz-image-region: rect(273px 16px 289px 0px);
 }
 
 #absolutePositionButton:hover {
   -moz-image-region: rect(273px 32px 289px 16px);
 }
 
 #absolutePositionButton:hover:active {
   -moz-image-region: rect(273px 48px 289px 32px);
 }
 
 #absolutePositionButton[disabled="true"] {
   -moz-image-region: rect(273px 64px 289px 48px) ! important;
 }
 
-
 #absolutePositionButton[checked="true"]{
   -moz-image-region: rect(289px 16px 305px 0px);
 }
 
 #absolutePositionButton[checked="true"]:hover {
   -moz-image-region: rect(289px 32px 305px 16px);
 }
 
 #absolutePositionButton[checked="true"]:hover:active {
   -moz-image-region: rect(289px 48px 305px 32px);
 }
 
-
-#FormatToolbar > #increaseZIndexButton {
+#increaseZIndexButton {
   list-style-image: url("chrome://editor/content/images/bringtofront.gif");
 }
-#FormatToolbar > #increaseZIndexButton[disabled="true"] {
+
+#increaseZIndexButton[disabled="true"] {
   list-style-image: url("chrome://editor/content/images/bringtofront-disabled.gif");
 }
-#FormatToolbar > #decreaseZIndexButton {
+
+#decreaseZIndexButton {
   list-style-image: url("chrome://editor/content/images/sendtoback.gif");
 }
-#FormatToolbar > #decreaseZIndexButton[disabled="true"] {
+
+#decreaseZIndexButton[disabled="true"] {
   list-style-image: url("chrome://editor/content/images/sendtoback-disabled.gif");
 }
--- a/suite/themes/classic/mac/editor/editorFormatToolbar.css
+++ b/suite/themes/classic/mac/editor/editorFormatToolbar.css
@@ -40,26 +40,23 @@
 
 /* ::::: formatting toolbar and buttons ::::: */
 
 #FormatToolbar {
   -moz-appearance: none;
   border-bottom: 1px solid rgba(0,0,0,0.35);
 }
 
-#FormatToolbar > toolbarbutton {
-  min-width: 32px;
-}
- 
 #FormatToolbar > toolbarbutton > .toolbarbutton-text {
   display: none;
 }
 
-#FormatToolbar > toolbarbutton {
+toolbarbutton.formatting-button {
   list-style-image: url("chrome://editor/skin/icons/btn2.gif");
+  min-width: 32px;
 }
 
 #DecreaseFontSizeButton {
   -moz-image-region: rect(64px 14px 80px 0px);
 }
 
 #DecreaseFontSizeButton:hover {
   -moz-image-region: rect(64px 28px 80px 14px);
@@ -514,50 +511,51 @@
 
 #HighlightColorButton[disabled="true"],
 #HighlightColorButton[disabled="true"]:hover,
 #HighlightColorButton[disabled="true"]:hover:active {
   -moz-image-region: rect(260px 64px 272px 48px);
 }
 
 
-#absolutePositionButton{
+#absolutePositionButton {
   -moz-image-region: rect(273px 16px 289px 0px);
 }
 
 #absolutePositionButton:hover {
   -moz-image-region: rect(273px 32px 289px 16px);
 }
 
 #absolutePositionButton:hover:active {
   -moz-image-region: rect(273px 48px 289px 32px);
 }
 
 #absolutePositionButton[disabled="true"] {
   -moz-image-region: rect(273px 64px 289px 48px) ! important;
 }
 
-
 #absolutePositionButton[checked="true"]{
   -moz-image-region: rect(289px 16px 305px 0px);
 }
 
 #absolutePositionButton[checked="true"]:hover {
   -moz-image-region: rect(289px 32px 305px 16px);
 }
 
 #absolutePositionButton[checked="true"]:hover:active {
   -moz-image-region: rect(289px 48px 305px 32px);
 }
 
-
-#FormatToolbar > #increaseZIndexButton {
+#increaseZIndexButton {
   list-style-image: url("chrome://editor/content/images/bringtofront.gif");
 }
-#FormatToolbar > #increaseZIndexButton[disabled="true"] {
+
+#increaseZIndexButton[disabled="true"] {
   list-style-image: url("chrome://editor/content/images/bringtofront-disabled.gif");
 }
-#FormatToolbar > #decreaseZIndexButton {
+
+#decreaseZIndexButton {
   list-style-image: url("chrome://editor/content/images/sendtoback.gif");
 }
-#FormatToolbar > #decreaseZIndexButton[disabled="true"] {
+
+#decreaseZIndexButton[disabled="true"] {
   list-style-image: url("chrome://editor/content/images/sendtoback-disabled.gif");
 }
--- a/suite/themes/modern/editor/editorFormatToolbar.css
+++ b/suite/themes/modern/editor/editorFormatToolbar.css
@@ -52,17 +52,17 @@
 }
 
 #FormatToolbar > toolbargrippy:hover:active {
   border-color: #67737E;
 }
 
 /* ::::: formatting buttons ::::: */
 
-#FormatToolbar > toolbarbutton {
+toolbarbutton.formatting-button {
   border: none !important;
   list-style-image: url("chrome://editor/skin/icons/btn2.gif");
   background-color: transparent !important;
 }
 
 #DecreaseFontSizeButton {
   -moz-image-region: rect(101px 22px 118px 0px);
 }
@@ -586,20 +586,23 @@
 #absolutePositionButton[checked="true"]:hover:active {
   -moz-image-region: rect(389px 66px 406px 44px);
 }
 
 #absolutePositionButton[disabled="true"] {
   -moz-image-region: rect(389px 88px 406px 66px) !important;
 }
 
-#FormatToolbar > #increaseZIndexButton {
+#increaseZIndexButton {
   list-style-image: url("chrome://editor/content/images/bringtofront.gif");
 }
-#FormatToolbar > #increaseZIndexButton[disabled="true"] {
+
+#increaseZIndexButton[disabled="true"] {
   list-style-image: url("chrome://editor/content/images/bringtofront-disabled.gif");
 }
-#FormatToolbar > #decreaseZIndexButton {
+
+#decreaseZIndexButton {
   list-style-image: url("chrome://editor/content/images/sendtoback.gif");
 }
-#FormatToolbar > #decreaseZIndexButton[disabled="true"] {
+
+#decreaseZIndexButton[disabled="true"] {
   list-style-image: url("chrome://editor/content/images/sendtoback-disabled.gif");
 }