Bug 250867 - icons only and other toolbar modes are not created in a global place. patch from Simon 'sipaq' Paquet <bugzilla@babylonsounds.com>, r=me, moa=mscott on the Thunderbird portions.

browser/base/content/browser.xul

@@ -44,6 +44,7 @@
 # ***** END LICENSE BLOCK *****
 
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://global/skin/findBar.css" type="text/css"?>
 

browser/themes/pinstripe/browser/browser.css

@@ -261,18 +261,6 @@ menubutton:not([disabled="true"]):hover:active {
   display: -moz-box;
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-text, toolbar[mode="text"] .toolbarbutton-1 > stack > toolbarbutton > .toolbarbutton-text {
-  margin: 4px;
-}
-
 #back-button, #forward-button  {
   -moz-binding: url("chrome://browser/skin/browser.xml#toolbar-menu-button");
 }

browser/themes/winstripe/browser/browser.css

@@ -253,19 +253,6 @@ toolbar[mode="full"] .toolbarbutton-menubutton-button {
   display: -moz-box;
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
 /* ::::: 24px primary toolbar buttons ::::: */
 
 /* back button-- */

calendar/sunbird/base/content/calendar.xul

@@ -45,6 +45,7 @@
 <!-- Style sheets -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://calendar/content/datetimepickers/minimonth.css" type="text/css"?>
 

calendar/sunbird/themes/pinstripe/sunbird/calendar.css

@@ -65,23 +65,6 @@
     max-height: 33px;
 }
 
-/*--------------------------------------------------------------------
- *   Icons-only and text-only mode
- *-------------------------------------------------------------------*/
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0px !important;
-  margin: 0px !important;
-}
-
 /*--------------------------------------------------------------------
  *   Primary toolbar buttons
  *-------------------------------------------------------------------*/

calendar/sunbird/themes/winstripe/sunbird/calendar.css

@@ -64,23 +64,6 @@
     max-height: 33px;
 }
 
-/*--------------------------------------------------------------------
- *   Icons-only and text-only mode
- *-------------------------------------------------------------------*/
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0px !important;
-  margin: 3px 5px !important;
-}
-
 /*--------------------------------------------------------------------
  *   Primary toolbar buttons
  *-------------------------------------------------------------------*/

mail/themes/pinstripe/mail/addrbook/addressbook.css

@@ -41,6 +41,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://global/skin/toolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
@@ -69,20 +70,6 @@ toolbarbutton[type="menu-button"] > toolbarbutton {
 }
 
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
-
 /* ::::: new single card icon ::::: */
 
 #button-newcard {

mail/themes/pinstripe/mail/compose/messengercompose.css

@@ -41,6 +41,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://global/skin/toolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -72,19 +73,6 @@ toolbarbutton[type="menu-button"] > toolbarbutton {
 	margin: 0px;
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
 #button-send {
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
   -moz-image-region: rect(0px 32px 32px 0px);

mail/themes/pinstripe/mail/mailWindow1.css

@@ -43,6 +43,7 @@
 
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://global/skin/toolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 

mail/themes/pinstripe/mail/primaryToolbar.css

@@ -63,20 +63,6 @@ toolbarbutton[type="menu-button"] > toolbarbutton {
 	margin: 0px;
 }
 
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
 #button-getmsg {
   -moz-image-region: rect(0px 32px 32px 0px);
 }

mail/themes/qute/mail/addrbook/addressbook.css

@@ -41,6 +41,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://global/skin/toolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
@@ -59,19 +60,6 @@
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
 #button-newcard {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook-toolbar.png");
   -moz-image-region: rect(0px 24px 24px 0px);

mail/themes/qute/mail/compose/messengercompose.css

@@ -41,6 +41,7 @@
   ======================================================================= */
 
 @import url("chrome://messenger/skin/");
+@import url("chrome://global/skin/toolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -62,19 +63,6 @@
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
 #button-send {
   list-style-image: url("chrome://messenger/skin/messengercompose/compose-toolbar.png");
   -moz-image-region: rect(0px 24px 24px 0px);

mail/themes/qute/mail/mailWindow1.css

@@ -43,6 +43,7 @@
 
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://global/skin/toolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 

mail/themes/qute/mail/primaryToolbar.css

@@ -56,19 +56,6 @@ toolbar[mode="full"] .toolbarbutton-1 {
   min-width: 47px;
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
-
 #button-getmsg {
   -moz-image-region: rect(0px 24px 24px 0px);
 }

toolkit/themes/gnomestripe/global/toolbar.css

@@ -80,6 +80,19 @@ toolbarspacer {
   width: 15px;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbarpaletteitem ::::: */
 
 toolbarpaletteitem {

toolkit/themes/pinstripe/global/toolbar.css

@@ -66,6 +66,18 @@ menubar {
  min-width: 1px;
 }  
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-text, toolbar[mode="text"] .toolbarbutton-1 > stack > toolbarbutton > .toolbarbutton-text {
+  margin: 4px;
+}
+
 /* ::::: toolbarseparator ::::: */
 
 toolbarseparator {

toolkit/themes/qute/global/toolbar.css

@@ -64,6 +64,19 @@ toolbar:first-child, menubar:first-child
   border-top: none;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {

toolkit/themes/winstripe/global/toolbar.css

@@ -69,6 +69,19 @@ toolbar[type="menubar"], menubar:first-child {
   border-top: none;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {