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.

2005-12-01 10:03:58 +00:00 · 2005-12-01 10:03:58 +00:00 · 6eb6ddc8ec
--- a/browser/base/content/browser.xul
+++ b/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"?>

--- a/browser/themes/pinstripe/browser/browser.css
+++ b/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");
 }
--- a/browser/themes/winstripe/browser/browser.css
+++ b/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-- */
--- a/calendar/sunbird/base/content/calendar.xul
+++ b/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"?>

--- a/calendar/sunbird/themes/pinstripe/sunbird/calendar.css
+++ b/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
 *-------------------------------------------------------------------*/
--- a/calendar/sunbird/themes/winstripe/sunbird/calendar.css
+++ b/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
 *-------------------------------------------------------------------*/
--- a/mail/themes/pinstripe/mail/addrbook/addressbook.css
+++ b/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 {
--- a/mail/themes/pinstripe/mail/compose/messengercompose.css
+++ b/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);
--- a/mail/themes/pinstripe/mail/mailWindow1.css
+++ b/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");

--- a/mail/themes/pinstripe/mail/primaryToolbar.css
+++ b/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);
 }
--- a/mail/themes/qute/mail/addrbook/addressbook.css
+++ b/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);
--- a/mail/themes/qute/mail/compose/messengercompose.css
+++ b/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);
--- a/mail/themes/qute/mail/mailWindow1.css
+++ b/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");

--- a/mail/themes/qute/mail/primaryToolbar.css
+++ b/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);
 }
--- a/toolkit/themes/gnomestripe/global/toolbar.css
+++ b/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 {
--- a/toolkit/themes/pinstripe/global/toolbar.css
+++ b/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 {
--- a/toolkit/themes/qute/global/toolbar.css
+++ b/toolkit/themes/qute/global/toolbar.css
@ -1,134 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla Communicator client code, released
- * March 31, 1998.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Hewitt (hewitt@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ===== toolbar.css ====================================================
-  == Styles used by XUL toolbar-related elements.
-  ======================================================================= */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ::::: toolbox ::::: */
-
-toolbox {
-  -moz-appearance: toolbox;
-  background-color: -moz-Dialog;
-}
-
-/* ::::: toolbar & menubar ::::: */
-
-toolbar,
-menubar {
-  min-width: 1px;
-  min-height: 20px;
-  border-top: 1px solid ThreeDHighlight;
-  border-bottom: 1px solid ThreeDShadow;
-}
-
-toolbar:first-child, menubar:first-child
-{
-  border-top: none;
-}
-
-/* ::::: toolbar decorations ::::: */
-
-toolbarseparator {
-  margin : 2px 0.2em;
-  border-right : 1px solid ThreeDHighlight;
-  border-left : 1px solid ThreeDShadow;
-  width : 2px;
-}
-
-toolbarspacer {
-  width: 15px;
-}
-
-/* ::::: toolbarpaletteitem ::::: */
-
-toolbarpaletteitem {
-  cursor: -moz-grab;
-}
-
-.toolbarpaletteitem-box[type="spacer"],
-.toolbarpaletteitem-box[type="spring"] {
-  border: 1px solid ThreeDShadow;
-}
-
-toolbarpaletteitem[place="toolbar"] {
-  margin-left: -2px;
-  margin-right: -2px;
-  border-left: 2px solid transparent;
-  border-right: 2px solid transparent;
-}
-
-toolbarpaletteitem[place="toolbar"] > toolbarspacer {
-  width: 11px;
-}
-
-.toolbarpaletteitem-box[type="spacer"][place="toolbar"],
-.toolbarpaletteitem-box[type="spring"][place="toolbar"] {
-  margin-top: 2px;
-  margin-bottom: 2px;
-  -moz-margin-start: 0px;
-  -moz-margin-end: 2px;
-}
-
-.toolbarpaletteitem-box[type="separator"][place="palette"] {
-  width: 2px;
-  height: 50px;
-}
-
-.toolbarpaletteitem-box[type="spacer"][place="palette"],
-.toolbarpaletteitem-box[type="spring"][place="palette"] {
-  margin-bottom: 2px;
-  width: 50px;
-  height: 50px;
-}
-
-.toolbarpaletteitem-box[type="spring"][place="palette"] {
-  background: url("chrome://global/skin/toolbar/Flex.png") no-repeat center;
-}
-
-/* ..... drag and drop feedback ..... */
-
-toolbarpaletteitem[dragover="left"] {
-  border-left-color: #000000;
-}
-
-toolbarpaletteitem[dragover="right"] {
-  border-right-color: #000000;
-}
--- a/toolkit/themes/winstripe/global/toolbar.css
+++ b/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 {